From ec5c928aa2c7dbc9456ac4a9e49d4ef34f3a98c9 Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Tue, 1 Feb 2022 14:04:51 -0800 Subject: [PATCH 1/2] not use latest containers for ci --- .github/workflows/ci.yml | 20 +++++++++----------- .github/workflows/clang-format.yml | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ccb62f27..27b34c379 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: jobs: linux-compat: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: image: @@ -40,7 +40,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build downstream -p ${{ env.PACKAGE_NAME }} linux-compiler-compat: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: compiler: @@ -63,7 +63,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} clang-sanitizers: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: sanitizers: [",thread", ",address,undefined"] @@ -75,7 +75,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=clang-11 --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}" linux-shared-libs: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - name: Build ${{ env.PACKAGE_NAME }} @@ -84,7 +84,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON byo-crypto: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - name: Build ${{ env.PACKAGE_NAME }} @@ -93,7 +93,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON windows: - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | @@ -101,7 +101,7 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} windows-vc14: - runs-on: windows-latest + runs-on: windows-2019 strategy: matrix: arch: [x86, x64] @@ -112,7 +112,7 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 windows-shared-libs: - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | @@ -120,12 +120,10 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON osx: - runs-on: macos-latest + runs-on: macos-11 steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" chmod a+x builder ./builder build downstream -p ${{ env.PACKAGE_NAME }} - - diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 888399221..9a39346fb 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -5,7 +5,7 @@ on: [push] jobs: clang-format: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout Sources From b81a0397e5a6d0fe2a2a0011b528312514f9bc36 Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Tue, 1 Feb 2022 15:26:10 -0800 Subject: [PATCH 2/2] add comments about why the version is selected --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/clang-format.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27b34c379..015282675 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: jobs: linux-compat: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # latest strategy: matrix: image: @@ -40,7 +40,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build downstream -p ${{ env.PACKAGE_NAME }} linux-compiler-compat: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # latest strategy: matrix: compiler: @@ -63,7 +63,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} clang-sanitizers: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # latest strategy: matrix: sanitizers: [",thread", ",address,undefined"] @@ -75,7 +75,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=clang-11 --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}" linux-shared-libs: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # latest steps: # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - name: Build ${{ env.PACKAGE_NAME }} @@ -84,7 +84,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON byo-crypto: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # latest steps: # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - name: Build ${{ env.PACKAGE_NAME }} @@ -93,7 +93,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON windows: - runs-on: windows-2022 + runs-on: windows-2022 # latest steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | @@ -101,7 +101,7 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} windows-vc14: - runs-on: windows-2019 + runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0) strategy: matrix: arch: [x86, x64] @@ -112,7 +112,7 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 windows-shared-libs: - runs-on: windows-2022 + runs-on: windows-2022 # latest steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | @@ -120,7 +120,7 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON osx: - runs-on: macos-11 + runs-on: macos-11 # latest steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 9a39346fb..cca2eb7cb 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -5,7 +5,7 @@ on: [push] jobs: clang-format: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # latest steps: - name: Checkout Sources