Skip to content

Commit

Permalink
Update GitHub runners
Browse files Browse the repository at this point in the history
 * Remove macOS 11
 * Update GitHub actions to Node 20 versions
 * Don't auto-update homebrew on macOS
  • Loading branch information
gfiumara committed Mar 8, 2024
1 parent 2a89923 commit 01dfc7d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-member.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
# https://github.com/actions/virtual-environments
- { os: macOS-13, arch: x64, embed_rf: OFF }
- { os: macOS-12, arch: x64, embed_rf: OFF }
- { os: macOS-11, arch: x64, embed_rf: OFF }
- { os: ubuntu-22.04, arch: x64, embed_rf: ON }
- { os: ubuntu-22.04, arch: x64, embed_rf: OFF }
- { os: ubuntu-20.04, arch: x64, embed_rf: OFF }
Expand All @@ -37,7 +36,7 @@ jobs:

steps:
- name: Checkout Code and Submodules
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -58,7 +57,7 @@ jobs:
- name: Package Cache (Windows)
if: ${{ runner.os == 'Windows' }}
id: vcpkg-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
key: ${{ matrix.config.os }}-${{ matrix.config.arch }}-vcpkg
Expand Down Expand Up @@ -89,7 +88,8 @@ jobs:
if: ${{ runner.os == 'macOS' }}
shell: bash
run: |
brew install \
HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 \
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install \
berkeley-db \
hwloc \
jpeg-turbo \
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Build Directory Cache
id: builddir-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/build
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
run: curl -o nfiq2_conformance.zip -L ${{ secrets.NFIQ2_CONFORMANCE_DATASET_URL }}

- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
# https://github.com/actions/virtual-environments
- { os: macOS-13, arch: x64, embed_rf: OFF }
- { os: macOS-12, arch: x64, embed_rf: OFF }
- { os: macOS-11, arch: x64, embed_rf: OFF }
- { os: ubuntu-22.04, arch: x64, embed_rf: ON }
- { os: ubuntu-22.04, arch: x64, embed_rf: OFF }
- { os: ubuntu-20.04, arch: x64, embed_rf: OFF }
Expand All @@ -35,7 +34,7 @@ jobs:

steps:
- name: Checkout Code and Submodules
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -56,7 +55,7 @@ jobs:
- name: Package Cache (Windows)
if: ${{ runner.os == 'Windows' }}
id: vcpkg-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
key: pr-${{ matrix.config.os }}-${{ matrix.config.arch }}-vcpkg
Expand Down Expand Up @@ -88,7 +87,8 @@ jobs:
if: ${{ runner.os == 'macOS' }}
shell: bash
run: |
brew install \
HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 \
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install \
berkeley-db \
hwloc \
jpeg-turbo \
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Build Directory Cache
id: builddir-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/build
Expand Down Expand Up @@ -202,9 +202,10 @@ jobs:
run: echo ${{ github.event.number }} > install_staging/pr_number

- name: Upload install_staging artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: install_staging-${{ matrix.config.os }}-${{ matrix.config.arch }}-embedded_${{ matrix.config.embed_rf }}
path: ${{ github.workspace }}/build/install_staging
retention-days: 7
if-no-files-found: error
overwrite: true
2 changes: 1 addition & 1 deletion .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false

Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/run-cts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
# https://github.com/actions/virtual-environments
- { os: macOS-13, arch: x64, embed_rf: OFF }
- { os: macOS-12, arch: x64, embed_rf: OFF }
- { os: macOS-11, arch: x64, embed_rf: OFF }
- { os: ubuntu-22.04, arch: x64, embed_rf: ON }
- { os: ubuntu-22.04, arch: x64, embed_rf: OFF }
- { os: ubuntu-20.04, arch: x64, embed_rf: OFF }
Expand All @@ -37,7 +36,7 @@ jobs:

steps:
- name: Checkout Conformance Test Script
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false

Expand All @@ -49,7 +48,7 @@ jobs:
run: sudo rm -rf /Library/Frameworks/Mono.framework

- name: Download install_staging artifact
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
Expand Down Expand Up @@ -110,7 +109,8 @@ jobs:
if: ${{ runner.os == 'macOS' }}
shell: bash
run: |
brew install \
HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 \
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install \
berkeley-db \
hwloc \
jpeg-turbo \
Expand All @@ -127,7 +127,7 @@ jobs:
run: curl -o nfiq2_conformance.zip -L ${{ secrets.NFIQ2_CONFORMANCE_DATASET_URL }}

- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down Expand Up @@ -168,12 +168,13 @@ jobs:
python conformance/diff.py -s conformance/conformance_expected_output.csv github.csv
- name: Upload conformance output artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: conformance_output-${{ matrix.config.os }}-${{ matrix.config.arch }}
path: github.csv
retention-days: 7
if-no-files-found: error
overwrite: true

- name: Failed the CTS
if: ${{ failure() }}
Expand All @@ -200,7 +201,7 @@ jobs:
- { os: ubuntu-22.04, arch: x64 }
steps:
- name: Download install_staging artifact
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
Expand Down Expand Up @@ -228,7 +229,7 @@ jobs:
unzip install_staging-${{ matrix.config.os }}-${{ matrix.config.arch }}.zip
- name: Passed the CTS
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down

0 comments on commit 01dfc7d

Please sign in to comment.