From a7ea1ddff7a846ce599d5b3816588799fa33ed68 Mon Sep 17 00:00:00 2001 From: Denis Lochmelis Date: Thu, 4 Jul 2024 14:54:54 +0200 Subject: [PATCH] Fix 3 --- .github/workflows/run-litmus.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-litmus.yml b/.github/workflows/run-litmus.yml index 57598e1..c05fa89 100644 --- a/.github/workflows/run-litmus.yml +++ b/.github/workflows/run-litmus.yml @@ -25,7 +25,7 @@ jobs: run: ./gradlew :cli:jvmRun --args="-r jcstress -j '-m quick' StoreBuffering.Plain" macos-run: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v4 @@ -33,14 +33,16 @@ jobs: distribution: oracle java-version: 17 - run: chmod +x gradlew - - name: Assemble CLI binary (x64) - run: ./gradlew cli:linkReleaseExecutableMacosX64 - - name: Run litmus tests via CLI (x64) + - name: Assemble all CLI artifacts + run: ./gradlew cli:assemble + - name: Run litmus tests via CLI (x64 + debug) + run: ./cli/build/bin/macosX64/debugExecutable/cli.kexe -r pthread ".*" + - name: Run litmus tests via CLI (x64 + release) run: ./cli/build/bin/macosX64/releaseExecutable/cli.kexe -r pthread ".*" - name: Run a single test with JCStress run: ./gradlew :cli:jvmRun --args="-r jcstress -j '-m quick' StoreBuffering.Plain" - - name: Assemble CLI binary (arm) - run: ./gradlew cli:linkReleaseExecutableMacosArm64 - - name: Run litmus tests via CLI (arm) + - name: Run litmus tests via CLI (arm + debug) + run: ./cli/build/bin/macosArm64/debugExecutable/cli.kexe -r pthread ".*" + - name: Run litmus tests via CLI (arm + release) run: ./cli/build/bin/macosArm64/releaseExecutable/cli.kexe -r pthread ".*"