From 38b449ec2a57ffd85d1a3af29c86703cac603cbc Mon Sep 17 00:00:00 2001 From: Aaron Delasy Date: Sun, 2 Feb 2025 17:23:04 +0200 Subject: [PATCH] Use machine architecture when running tests --- .github/workflows/cross-compile.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index e1f321866..34003c309 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -42,7 +42,7 @@ jobs: - run: sudo apt-get install mingw-w64 ninja-build - run: curl -fsSL https://cdn.thelang.io/deps.tar.gz | sudo tar -C /usr/local -xz - if: matrix.config.platform == 'macos' - run: echo "THE_DEPS_DIR=/usr/local/the/cross-compile/${{ matrix.config.platform }}/x86_64" >> $GITHUB_ENV + run: echo "THE_DEPS_DIR=/usr/local/the/cross-compile/${{ matrix.config.platform }}/$(uname -m)" >> $GITHUB_ENV - if: matrix.config.platform != 'macos' run: echo "THE_DEPS_DIR=/usr/local/the/cross-compile/${{ matrix.config.platform }}" >> $GITHUB_ENV - run: echo "/usr/local/the/osxcross/bin" >> $GITHUB_PATH diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63b632ea9..55f1048c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,7 @@ jobs: - if: runner.os == 'Linux' run: echo "THE_DEPS_DIR=$PWD/the/native/${{ matrix.config.platform }}" >> $GITHUB_ENV - if: runner.os == 'macOS' - run: echo "THE_DEPS_DIR=$PWD/the/native/${{ matrix.config.platform }}/x86_64" >> $GITHUB_ENV + run: echo "THE_DEPS_DIR=$PWD/the/native/${{ matrix.config.platform }}/$(uname -m)" >> $GITHUB_ENV - if: runner.os == 'Windows' run: echo "THE_DEPS_DIR=$PWD/the/native/${{ matrix.config.platform }}" | Out-File -FilePath $env:GITHUB_ENV -Append - if: matrix.config.memcheck != 'memcheck'