From be5ae75bcdc379a91f9c0211514728acaabd03e1 Mon Sep 17 00:00:00 2001 From: Lucas Willems Date: Fri, 29 Nov 2024 09:25:43 +0100 Subject: [PATCH] WIP --- .github/workflows/main.yml | 6 +++++- .github/workflows/release-scenexec.yml | 6 +++--- .github/workflows/release-xsuite-fullsimulnet.yml | 4 ++-- .github/workflows/release-xsuite-lightsimulnet.yml | 4 ++-- xsuite/src/cli/testScenCmd.ts | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4be18639..97ab8ea2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,11 @@ on: jobs: build-and-test: - runs-on: ubuntu-22.04 + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + + runs-on: ${{ matrix.os }} steps: - name: Checkout diff --git a/.github/workflows/release-scenexec.yml b/.github/workflows/release-scenexec.yml index 4e97b851..fb2d401e 100644 --- a/.github/workflows/release-scenexec.yml +++ b/.github/workflows/release-scenexec.yml @@ -10,13 +10,13 @@ jobs: build: strategy: matrix: - os: [ubuntu-22.04, macos-12] + os: [ubuntu-22.04, macos-13] include: - os: ubuntu-22.04 wasmer_lib: libwasmer_linux_amd64.so wasmer2_lib: libvmexeccapi.so flags: -ldflags "-extldflags '-Wl,-rpath,\$ORIGIN'" - - os: macos-12 + - os: macos-13 wasmer_lib: libwasmer_darwin_amd64.dylib wasmer2_lib: libvmexeccapi.dylib flags: -ldflags "-extldflags '-Wl,-rpath,@loader_path'" @@ -56,7 +56,7 @@ jobs: strategy: matrix: - os: [ubuntu-22.04, macos-12] + os: [ubuntu-22.04, macos-13] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release-xsuite-fullsimulnet.yml b/.github/workflows/release-xsuite-fullsimulnet.yml index 32778393..0e677939 100644 --- a/.github/workflows/release-xsuite-fullsimulnet.yml +++ b/.github/workflows/release-xsuite-fullsimulnet.yml @@ -7,7 +7,7 @@ jobs: build: strategy: matrix: - os: [macos-12, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] runs-on: ${{ matrix.os }} @@ -40,7 +40,7 @@ jobs: strategy: matrix: - os: [macos-12, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release-xsuite-lightsimulnet.yml b/.github/workflows/release-xsuite-lightsimulnet.yml index d639c389..21a4c025 100644 --- a/.github/workflows/release-xsuite-lightsimulnet.yml +++ b/.github/workflows/release-xsuite-lightsimulnet.yml @@ -7,7 +7,7 @@ jobs: build: strategy: matrix: - os: [macos-12, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] runs-on: ${{ matrix.os }} @@ -40,7 +40,7 @@ jobs: strategy: matrix: - os: [macos-12, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] runs-on: ${{ matrix.os }} diff --git a/xsuite/src/cli/testScenCmd.ts b/xsuite/src/cli/testScenCmd.ts index 830d7178..2c329c30 100644 --- a/xsuite/src/cli/testScenCmd.ts +++ b/xsuite/src/cli/testScenCmd.ts @@ -41,7 +41,7 @@ export function getBinaryOs() { return "ubuntu-20.04"; /* istanbul ignore next */ case "darwin": - return "macos-12"; + return "macos-13"; /* istanbul ignore next */ default: throw new Error(`Unsupported platform: ${process.platform}`);