diff options
| author | ruki <[email protected]> | 2025-01-17 21:42:37 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-17 21:42:37 +0800 |
| commit | a4934a2c00d9ae14b4e32c163b8d87f99a81fb78 (patch) | |
| tree | c7c786c88c5872ea2764df47eb90ffe712e5377d /.github/workflows | |
| parent | a13a14716d315a3e102420bb788521aa445b81c4 (diff) | |
Update cosmocc.yml
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/cosmocc.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.github/workflows/cosmocc.yml b/.github/workflows/cosmocc.yml index f0e0ce479..0670beca8 100644 --- a/.github/workflows/cosmocc.yml +++ b/.github/workflows/cosmocc.yml @@ -1,4 +1,4 @@ -name: Cosmocc (linux-x86_64) +name: Cosmocc on: pull_request: @@ -10,13 +10,13 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-13] arch: [x86_64] runs-on: ${{ matrix.os }} concurrency: - group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cosmocc-Linux-${{ matrix.arch }} + group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cosmocc-${{ matrix.os }}-${{ matrix.arch }} cancel-in-progress: true steps: @@ -43,6 +43,7 @@ jobs: cd .. - name: Prepare + if: matrix.os == 'ubuntu-latest' run: | sudo apt update sudo apt install -y ruby ruby-dev rubygems build-essential llvm libc++-dev @@ -54,6 +55,14 @@ jobs: ls -l core/build/ core/build/xmake --version core/build/xmake lua -v -D tests/run.lua + + # In the tests, cmake tries to use make from the cosmopolitan toolchain and fails, so uninstall it + - name: Remove cosmocc + run: | + INSTALL_DIR="${{runner.temp}}/cosmocc-4.0.2" + echo "Removing cosmocc from PATH" + echo "::remove-path::${INSTALL_DIR}/bin" + rm -r "${INSTALL_DIR}" - name: Artifact uses: actions/upload-artifact@v4 |