From 98c947f277e650a43fa8533c946f313bc1dec045 Mon Sep 17 00:00:00 2001 From: Fabrice Benhamouda Date: Fri, 26 Apr 2024 14:15:51 -0400 Subject: [PATCH 1/3] Add dependency to python3-six in github action grpc Fix Github actions to work with Ubuntu 24.04 Ubuntu 24.04 does not provide the Python package six by default, contrary to previous Ubuntu versions. This causes issues with the integrations:grpc action. --- .github/workflows/integrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index e967d09b6e..17aabcb66c 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -46,7 +46,7 @@ jobs: - name: Install OS Dependencies run: | apt-get update - apt-get -y --no-install-recommends install cmake gcc g++ ninja-build golang make python3 python3-sphinx autoconf libtool pkg-config git libc++-dev + apt-get -y --no-install-recommends install cmake gcc g++ ninja-build golang make python3 python3-sphinx autoconf libtool pkg-config git libc++-dev python3-six - uses: actions/checkout@v3 - name: Run integration build run: | From 4e0294ad7ace118bea237dee4bce5fea0b123cbb Mon Sep 17 00:00:00 2001 From: Fabrice Benhamouda Date: Fri, 26 Apr 2024 15:07:44 -0400 Subject: [PATCH 2/3] Adding missing dependencies for macOS-x86* CI tests --- .github/workflows/actions-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/actions-ci.yml b/.github/workflows/actions-ci.yml index f74c29de48..0a0188b4ba 100644 --- a/.github/workflows/actions-ci.yml +++ b/.github/workflows/actions-ci.yml @@ -35,6 +35,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 + - name: Install dependencies + run: | + brew install ninja golang - name: Build ${{ env.PACKAGE_NAME }} run: | ./tests/ci/run_posix_tests.sh @@ -45,6 +48,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 + - name: Install dependencies + run: | + brew install ninja golang - name: Build ${{ env.PACKAGE_NAME }} with FIPS mode run: | ./tests/ci/run_fips_tests.sh From dca3fc316b3d602adfae27cbc3e4845aafafe2e7 Mon Sep 17 00:00:00 2001 From: Fabrice Benhamouda Date: Fri, 26 Apr 2024 15:12:35 -0400 Subject: [PATCH 3/3] Fixing the macOS-x86* Github actions to actually use Intel Mac According to https://github.com/actions/runner-images?tab=readme-ov-file#available-images macos-latest now runs on M1 (ARM), and not Intel CPU. This commit switches this image to macos-latest-large, so Intel CPU is used. --- .github/workflows/actions-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions-ci.yml b/.github/workflows/actions-ci.yml index 0a0188b4ba..393238e7a1 100644 --- a/.github/workflows/actions-ci.yml +++ b/.github/workflows/actions-ci.yml @@ -32,7 +32,7 @@ jobs: macOS-x86: if: github.repository_owner == 'aws' needs: [sanity-test-run] - runs-on: macos-latest + runs-on: macos-latest-large steps: - uses: actions/checkout@v2 - name: Install dependencies @@ -45,7 +45,7 @@ jobs: macOS-x86-FIPS: if: github.repository_owner == 'aws' needs: [sanity-test-run] - runs-on: macos-latest + runs-on: macos-latest-large steps: - uses: actions/checkout@v2 - name: Install dependencies