Commit 409dd8a1 authored by Wez Furlong's avatar Wez Furlong Committed by Facebook GitHub Bot

getdeps: embrace python3 a bit more

Summary:
Ensure that we are referencing python3 in the paths
that we generate for the github actions workflows, and remove
some shebangs that influence how our internal linters process
the python code.

Reviewed By: fanzeyi

Differential Revision: D20659747

fbshipit-source-id: 6f300f8e91edf7701bb27babc7b1418958cf0a10
parent ac78d14c
...@@ -16,170 +16,188 @@ jobs: ...@@ -16,170 +16,188 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Fetch boost - name: Fetch boost
run: python build/fbcode_builder/getdeps.py fetch --no-tests boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost
- name: Fetch ninja - name: Fetch ninja
run: python build/fbcode_builder/getdeps.py fetch --no-tests ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja
- name: Fetch cmake - name: Fetch cmake
run: python build/fbcode_builder/getdeps.py fetch --no-tests cmake run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake
- name: Fetch double-conversion - name: Fetch double-conversion
run: python build/fbcode_builder/getdeps.py fetch --no-tests double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion
- name: Fetch fmt - name: Fetch fmt
run: python build/fbcode_builder/getdeps.py fetch --no-tests fmt run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt
- name: Fetch gflags - name: Fetch gflags
run: python build/fbcode_builder/getdeps.py fetch --no-tests gflags run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags
- name: Fetch glog - name: Fetch glog
run: python build/fbcode_builder/getdeps.py fetch --no-tests glog run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog
- name: Fetch googletest - name: Fetch googletest
run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest
- name: Fetch libevent - name: Fetch libevent
run: python build/fbcode_builder/getdeps.py fetch --no-tests libevent run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent
- name: Fetch snappy - name: Fetch snappy
run: python build/fbcode_builder/getdeps.py fetch --no-tests snappy run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy
- name: Fetch zstd - name: Fetch zstd
run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd
- name: Build boost - name: Build boost
run: python build/fbcode_builder/getdeps.py build --no-tests boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost
- name: Build ninja - name: Build ninja
run: python build/fbcode_builder/getdeps.py build --no-tests ninja run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja
- name: Build cmake - name: Build cmake
run: python build/fbcode_builder/getdeps.py build --no-tests cmake run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake
- name: Build double-conversion - name: Build double-conversion
run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion
- name: Build fmt - name: Build fmt
run: python build/fbcode_builder/getdeps.py build --no-tests fmt run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt
- name: Build gflags - name: Build gflags
run: python build/fbcode_builder/getdeps.py build --no-tests gflags run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags
- name: Build glog - name: Build glog
run: python build/fbcode_builder/getdeps.py build --no-tests glog run: python3 build/fbcode_builder/getdeps.py build --no-tests glog
- name: Build googletest - name: Build googletest
run: python build/fbcode_builder/getdeps.py build --no-tests googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest
- name: Build libevent - name: Build libevent
run: python build/fbcode_builder/getdeps.py build --no-tests libevent run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent
- name: Build snappy - name: Build snappy
run: python build/fbcode_builder/getdeps.py build --no-tests snappy run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy
- name: Build zstd - name: Build zstd
run: python build/fbcode_builder/getdeps.py build --no-tests zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd
- name: Build folly - name: Build folly
run: python build/fbcode_builder/getdeps.py build --src-dir=. folly run: python3 build/fbcode_builder/getdeps.py build --src-dir=. folly
- name: Copy artifacts
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. folly _artifacts/linux
- uses: actions/upload-artifact@master
with:
name: folly
path: _artifacts
- name: Test folly - name: Test folly
run: python build/fbcode_builder/getdeps.py test --src-dir=. folly run: python3 build/fbcode_builder/getdeps.py test --src-dir=. folly
mac: mac:
runs-on: macOS-latest runs-on: macOS-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Fetch boost - name: Fetch boost
run: python build/fbcode_builder/getdeps.py fetch --no-tests boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost
- name: Fetch openssl - name: Fetch openssl
run: python build/fbcode_builder/getdeps.py fetch --no-tests openssl run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl
- name: Fetch ninja - name: Fetch ninja
run: python build/fbcode_builder/getdeps.py fetch --no-tests ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja
- name: Fetch cmake - name: Fetch cmake
run: python build/fbcode_builder/getdeps.py fetch --no-tests cmake run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake
- name: Fetch double-conversion - name: Fetch double-conversion
run: python build/fbcode_builder/getdeps.py fetch --no-tests double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion
- name: Fetch fmt - name: Fetch fmt
run: python build/fbcode_builder/getdeps.py fetch --no-tests fmt run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt
- name: Fetch gflags - name: Fetch gflags
run: python build/fbcode_builder/getdeps.py fetch --no-tests gflags run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags
- name: Fetch glog - name: Fetch glog
run: python build/fbcode_builder/getdeps.py fetch --no-tests glog run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog
- name: Fetch googletest - name: Fetch googletest
run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest
- name: Fetch libevent - name: Fetch libevent
run: python build/fbcode_builder/getdeps.py fetch --no-tests libevent run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent
- name: Fetch snappy - name: Fetch snappy
run: python build/fbcode_builder/getdeps.py fetch --no-tests snappy run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy
- name: Fetch zstd - name: Fetch zstd
run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd
- name: Build boost - name: Build boost
run: python build/fbcode_builder/getdeps.py build --no-tests boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost
- name: Build openssl - name: Build openssl
run: python build/fbcode_builder/getdeps.py build --no-tests openssl run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl
- name: Build ninja - name: Build ninja
run: python build/fbcode_builder/getdeps.py build --no-tests ninja run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja
- name: Build cmake - name: Build cmake
run: python build/fbcode_builder/getdeps.py build --no-tests cmake run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake
- name: Build double-conversion - name: Build double-conversion
run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion
- name: Build fmt - name: Build fmt
run: python build/fbcode_builder/getdeps.py build --no-tests fmt run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt
- name: Build gflags - name: Build gflags
run: python build/fbcode_builder/getdeps.py build --no-tests gflags run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags
- name: Build glog - name: Build glog
run: python build/fbcode_builder/getdeps.py build --no-tests glog run: python3 build/fbcode_builder/getdeps.py build --no-tests glog
- name: Build googletest - name: Build googletest
run: python build/fbcode_builder/getdeps.py build --no-tests googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest
- name: Build libevent - name: Build libevent
run: python build/fbcode_builder/getdeps.py build --no-tests libevent run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent
- name: Build snappy - name: Build snappy
run: python build/fbcode_builder/getdeps.py build --no-tests snappy run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy
- name: Build zstd - name: Build zstd
run: python build/fbcode_builder/getdeps.py build --no-tests zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd
- name: Build folly - name: Build folly
run: python build/fbcode_builder/getdeps.py build --src-dir=. folly run: python3 build/fbcode_builder/getdeps.py build --src-dir=. folly
- name: Copy artifacts
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. folly _artifacts/mac
- uses: actions/upload-artifact@master
with:
name: folly
path: _artifacts
- name: Test folly - name: Test folly
run: python build/fbcode_builder/getdeps.py test --src-dir=. folly run: python3 build/fbcode_builder/getdeps.py test --src-dir=. folly
windows: windows:
runs-on: windows-2016 runs-on: windows-2016
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Fetch boost - name: Fetch boost
run: python build/fbcode_builder/getdeps.py fetch --no-tests boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost
- name: Fetch perl - name: Fetch perl
run: python build/fbcode_builder/getdeps.py fetch --no-tests perl run: python3 build/fbcode_builder/getdeps.py fetch --no-tests perl
- name: Fetch openssl - name: Fetch openssl
run: python build/fbcode_builder/getdeps.py fetch --no-tests openssl run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl
- name: Fetch ninja - name: Fetch ninja
run: python build/fbcode_builder/getdeps.py fetch --no-tests ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja
- name: Fetch cmake - name: Fetch cmake
run: python build/fbcode_builder/getdeps.py fetch --no-tests cmake run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake
- name: Fetch double-conversion - name: Fetch double-conversion
run: python build/fbcode_builder/getdeps.py fetch --no-tests double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion
- name: Fetch fmt - name: Fetch fmt
run: python build/fbcode_builder/getdeps.py fetch --no-tests fmt run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt
- name: Fetch gflags - name: Fetch gflags
run: python build/fbcode_builder/getdeps.py fetch --no-tests gflags run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags
- name: Fetch glog - name: Fetch glog
run: python build/fbcode_builder/getdeps.py fetch --no-tests glog run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog
- name: Fetch googletest - name: Fetch googletest
run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest
- name: Fetch libevent - name: Fetch libevent
run: python build/fbcode_builder/getdeps.py fetch --no-tests libevent run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent
- name: Fetch snappy - name: Fetch snappy
run: python build/fbcode_builder/getdeps.py fetch --no-tests snappy run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy
- name: Fetch zlib - name: Fetch zlib
run: python build/fbcode_builder/getdeps.py fetch --no-tests zlib run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib
- name: Fetch zstd - name: Fetch zstd
run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd
- name: Build boost - name: Build boost
run: python build/fbcode_builder/getdeps.py build --no-tests boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost
- name: Build perl - name: Build perl
run: python build/fbcode_builder/getdeps.py build --no-tests perl run: python3 build/fbcode_builder/getdeps.py build --no-tests perl
- name: Build openssl - name: Build openssl
run: python build/fbcode_builder/getdeps.py build --no-tests openssl run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl
- name: Build ninja - name: Build ninja
run: python build/fbcode_builder/getdeps.py build --no-tests ninja run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja
- name: Build cmake - name: Build cmake
run: python build/fbcode_builder/getdeps.py build --no-tests cmake run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake
- name: Build double-conversion - name: Build double-conversion
run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion
- name: Build fmt - name: Build fmt
run: python build/fbcode_builder/getdeps.py build --no-tests fmt run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt
- name: Build gflags - name: Build gflags
run: python build/fbcode_builder/getdeps.py build --no-tests gflags run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags
- name: Build glog - name: Build glog
run: python build/fbcode_builder/getdeps.py build --no-tests glog run: python3 build/fbcode_builder/getdeps.py build --no-tests glog
- name: Build googletest - name: Build googletest
run: python build/fbcode_builder/getdeps.py build --no-tests googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest
- name: Build libevent - name: Build libevent
run: python build/fbcode_builder/getdeps.py build --no-tests libevent run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent
- name: Build snappy - name: Build snappy
run: python build/fbcode_builder/getdeps.py build --no-tests snappy run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy
- name: Build zlib - name: Build zlib
run: python build/fbcode_builder/getdeps.py build --no-tests zlib run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib
- name: Build zstd - name: Build zstd
run: python build/fbcode_builder/getdeps.py build --no-tests zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd
- name: Build folly - name: Build folly
run: python build/fbcode_builder/getdeps.py build --src-dir=. folly run: python3 build/fbcode_builder/getdeps.py build --src-dir=. folly
- name: Copy artifacts
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. folly _artifacts/windows
- uses: actions/upload-artifact@master
with:
name: folly
path: _artifacts
- name: Test folly - name: Test folly
run: python build/fbcode_builder/getdeps.py test --src-dir=. folly run: python3 build/fbcode_builder/getdeps.py test --src-dir=. folly
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
...@@ -635,7 +635,7 @@ jobs: ...@@ -635,7 +635,7 @@ jobs:
if m != manifest: if m != manifest:
out.write(" - name: Fetch %s\n" % m.name) out.write(" - name: Fetch %s\n" % m.name)
out.write( out.write(
" run: python build/fbcode_builder/getdeps.py fetch " " run: python3 build/fbcode_builder/getdeps.py fetch "
"--no-tests %s\n" % m.name "--no-tests %s\n" % m.name
) )
...@@ -643,19 +643,19 @@ jobs: ...@@ -643,19 +643,19 @@ jobs:
if m != manifest: if m != manifest:
out.write(" - name: Build %s\n" % m.name) out.write(" - name: Build %s\n" % m.name)
out.write( out.write(
" run: python build/fbcode_builder/getdeps.py build " " run: python3 build/fbcode_builder/getdeps.py build "
"--no-tests %s\n" % m.name "--no-tests %s\n" % m.name
) )
out.write(" - name: Build %s\n" % manifest.name) out.write(" - name: Build %s\n" % manifest.name)
out.write( out.write(
" run: python build/fbcode_builder/getdeps.py build --src-dir=. %s\n" " run: python3 build/fbcode_builder/getdeps.py build --src-dir=. %s\n"
% manifest.name % manifest.name
) )
out.write(" - name: Copy artifacts\n") out.write(" - name: Copy artifacts\n")
out.write( out.write(
" run: python build/fbcode_builder/getdeps.py fixup-dyn-deps " " run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps "
"--src-dir=. %s _artifacts/%s\n" % (manifest.name, job_name) "--src-dir=. %s _artifacts/%s\n" % (manifest.name, job_name)
) )
out.write(" - uses: actions/upload-artifact@master\n") out.write(" - uses: actions/upload-artifact@master\n")
...@@ -665,7 +665,7 @@ jobs: ...@@ -665,7 +665,7 @@ jobs:
out.write(" - name: Test %s\n" % manifest.name) out.write(" - name: Test %s\n" % manifest.name)
out.write( out.write(
" run: python build/fbcode_builder/getdeps.py test --src-dir=. %s\n" " run: python3 build/fbcode_builder/getdeps.py test --src-dir=. %s\n"
% manifest.name % manifest.name
) )
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
#!/usr/bin/env python
# Copyright (c) Facebook, Inc. and its affiliates. # Copyright (c) Facebook, Inc. and its affiliates.
# #
# This source code is licensed under the MIT license found in the # This source code is licensed under the MIT license found in the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment