diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 8326123d264..00eb472aae2 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Fetch ninja @@ -51,22 +51,20 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests automake - name: Fetch libtool run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool - - name: Fetch bison - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests bison - name: Fetch libsodium run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium - - name: Fetch xz - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xz - - name: Fetch folly - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly - - name: Fetch fizz - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch libffi run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libffi - name: Fetch ncurses run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ncurses - name: Fetch python run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python + - name: Fetch xz + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xz + - name: Fetch folly + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly + - name: Fetch fizz + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch wangle run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Build ninja @@ -105,26 +103,24 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests automake - name: Build libtool run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool - - name: Build bison - run: python3 build/fbcode_builder/getdeps.py build --no-tests bison - name: Build libsodium run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium - - name: Build xz - run: python3 build/fbcode_builder/getdeps.py build --no-tests xz - - name: Build folly - run: python3 build/fbcode_builder/getdeps.py build --no-tests folly - - name: Build fizz - run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build libffi run: python3 build/fbcode_builder/getdeps.py build --no-tests libffi - name: Build ncurses run: python3 build/fbcode_builder/getdeps.py build --no-tests ncurses - name: Build python run: python3 build/fbcode_builder/getdeps.py build --no-tests python + - name: Build xz + run: python3 build/fbcode_builder/getdeps.py build --no-tests xz + - name: Build folly + run: python3 build/fbcode_builder/getdeps.py build --no-tests folly + - name: Build fizz + run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build wangle run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build fbthrift - run: python3 build/fbcode_builder/getdeps.py build --allow-system-packages --src-dir=. fbthrift --project-install-prefix fbthrift:/usr/local + run: python3 build/fbcode_builder/getdeps.py build --src-dir=. fbthrift --project-install-prefix fbthrift:/usr/local - name: Copy artifacts run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --strip --src-dir=. fbthrift _artifacts/linux --project-install-prefix fbthrift:/usr/local --final-install-prefix /usr/local - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index dc2b2527a6f..6af9ef8932a 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -51,8 +51,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests automake - name: Fetch libtool run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool - - name: Fetch bison - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests bison - name: Fetch libsodium run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium - name: Fetch xz @@ -99,8 +97,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests automake - name: Build libtool run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool - - name: Build bison - run: python3 build/fbcode_builder/getdeps.py build --no-tests bison - name: Build libsodium run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium - name: Build xz diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 03cd8c079ce..24d19bb3001 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -22,8 +22,6 @@ jobs: - name: Disable autocrlf run: git config --system core.autocrlf false - uses: actions/checkout@v2 - - name: Fetch bison - run: python build/fbcode_builder/getdeps.py fetch --no-tests bison - name: Fetch libsodium run: python build/fbcode_builder/getdeps.py fetch --no-tests libsodium - name: Fetch ninja @@ -64,8 +62,6 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch wangle run: python build/fbcode_builder/getdeps.py fetch --no-tests wangle - - name: Build bison - run: python build/fbcode_builder/getdeps.py build --no-tests bison - name: Build libsodium run: python build/fbcode_builder/getdeps.py build --no-tests libsodium - name: Build ninja diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 369285bb8ad..8c270c0bc60 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1115,7 +1115,7 @@ def setup_project_cmd_parser(self, parser): help="Allow CI to fire on all branches - Handy for testing", ) parser.add_argument( - "--ubuntu-version", default="18.04", help="Version of Ubuntu to use" + "--ubuntu-version", default="20.04", help="Version of Ubuntu to use" ) parser.add_argument( "--main-branch",