From 0104a49e395e63af10b7c4e9d53410c28f24e78e Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 24 Dec 2024 08:44:34 -0500 Subject: [PATCH] Switch back to ubuntu-latest in workflow Signed-off-by: Timothy Johnson --- .github/workflows/secrets-sdk.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml index 83459803e8..7f59ab1125 100644 --- a/.github/workflows/secrets-sdk.yml +++ b/.github/workflows/secrets-sdk.yml @@ -38,27 +38,27 @@ jobs: npm run build -- --target i686-pc-windows-msvc npm run test target: i686-pc-windows-msvc - - host: ubuntu-22.04 + - host: ubuntu-latest target: x86_64-unknown-linux-gnu use-cross: true build: | set -e CARGO=cross npm run build -- --target x86_64-unknown-linux-gnu - - host: ubuntu-22.04 + - host: ubuntu-latest target: i686-unknown-linux-gnu use-cross: true build: | set -e source scripts/configure-cross.sh i686-unknown-linux-gnu CARGO=cross npm run build -- --target i686-unknown-linux-gnu - - host: ubuntu-22.04 + - host: ubuntu-latest target: armv7-unknown-linux-gnueabihf use-cross: true build: | set -e source scripts/configure-cross.sh armv7-unknown-linux-gnueabihf CARGO=cross npm run build -- --target armv7-unknown-linux-gnueabihf - - host: ubuntu-22.04 + - host: ubuntu-latest target: x86_64-unknown-linux-musl use-cross: true build: | @@ -67,14 +67,14 @@ jobs: - host: macos-latest target: aarch64-apple-darwin build: npm run build -- --target aarch64-apple-darwin - - host: ubuntu-22.04 + - host: ubuntu-latest target: aarch64-unknown-linux-gnu use-cross: true build: | set -e source scripts/configure-cross.sh aarch64-unknown-linux-gnu CARGO=cross npm run build -- --target aarch64-unknown-linux-gnu - - host: ubuntu-22.04 + - host: ubuntu-latest target: aarch64-unknown-linux-musl use-cross: true build: | @@ -208,17 +208,17 @@ jobs: - host: macos-latest target: x86_64-apple-darwin architecture: x64 - - host: ubuntu-22.04 + - host: ubuntu-latest target: x86_64-unknown-linux-gnu - - host: ubuntu-22.04 + - host: ubuntu-latest target: x86_64-unknown-linux-musl - - host: ubuntu-22.04 + - host: ubuntu-latest target: aarch64-unknown-linux-gnu platform: linux/arm64 - - host: ubuntu-22.04 + - host: ubuntu-latest target: aarch64-unknown-linux-musl platform: linux/arm64 - - host: ubuntu-22.04 + - host: ubuntu-latest target: armv7-unknown-linux-gnueabihf platform: linux/arm/v7 node: @@ -250,10 +250,10 @@ jobs: if: ${{ matrix.settings.platform }} - name: Test bindings run: npm run test - if: ${{ matrix.settings.host != 'ubuntu-22.04' }} + if: ${{ matrix.settings.host != 'ubuntu-latest' }} - name: Setup and run tests uses: addnab/docker-run-action@v3 - if: ${{ matrix.settings.host == 'ubuntu-22.04' && !endsWith(matrix.settings.target, 'musl') }} + if: ${{ matrix.settings.host == 'ubuntu-latest' && !endsWith(matrix.settings.target, 'musl') }} with: image: ${{ format('node:{0}-slim', matrix.node) }} options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}" @@ -263,7 +263,7 @@ jobs: cd packages/secrets && dbus-run-session -- bash scripts/linux-test.sh - name: Setup and run tests (MUSL) uses: addnab/docker-run-action@v3 - if: ${{ matrix.settings.host == 'ubuntu-22.04' && endsWith(matrix.settings.target, 'musl') }} + if: ${{ matrix.settings.host == 'ubuntu-latest' && endsWith(matrix.settings.target, 'musl') }} with: image: ${{ format('node:{0}-alpine', matrix.node) }} options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}"