From 79801fcf9a54edc5a09994153554a43a1c80bd2f Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 19 Aug 2022 14:12:05 -0700 Subject: [PATCH 1/2] regenerate GitHub actions for all projects Summary: After D38831140 (https://github.com/facebook/openr/commit/4022c77a8c319a65f394fa53dc29608d8b0d63bb), `bison` no longer needs to be fetched by most projects. Differential Revision: D38877152 fbshipit-source-id: 6bc94749070e57c25363ead107641cb7679e4d56 --- .github/workflows/getdeps_linux.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 1cdf86064c7..68317146815 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -49,22 +49,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: Fetch fbthrift @@ -111,22 +109,20 @@ 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 From 60b846d20bd3a2a9f74e1a102847b06f5974a082 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 19 Aug 2022 14:12:23 -0700 Subject: [PATCH 2/2] upgrade getdeps GitHub actions to Ubuntu 20 Summary: Sadly, even though Ubuntu 18.04 is still in LTS, GitHub is deprecating its runner image. Migrate the generated GitHub Actions to 20.04. https://github.com/actions/runner-images/issues/6002 https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/ Reviewed By: fanzeyi Differential Revision: D38877286 fbshipit-source-id: 692b9f14ff977e4e406eb673d8c3d87ff53eec94 --- .github/workflows/getdeps_linux.yml | 2 +- build/fbcode_builder/getdeps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 68317146815..a604ac60b2e 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -6,7 +6,7 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Fetch boost 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",