From 73f6ed7c8ee0a4b117d636318554be6a0bac233a Mon Sep 17 00:00:00 2001 From: alemi Date: Tue, 10 Sep 2024 03:39:01 +0200 Subject: [PATCH] ci(lua): re-enable macos runner --- .github/workflows/lua.yml | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/lua.yml b/.github/workflows/lua.yml index 6f3d4cc..cf251c3 100644 --- a/.github/workflows/lua.yml +++ b/.github/workflows/lua.yml @@ -37,36 +37,36 @@ jobs: # macos requires some extra cargo config to make it work, but # these settings make test fail so better limit them to this run - #build-macos: - # runs-on: ${{ matrix.platform.runner }} - # strategy: - # fail-fast: false - # matrix: - # platform: - # - runner: macos-14 - # target: darwin-arm64 - # filename: codemp.dylib - # #- runner: macos-12 - # # target: darwin-x64 - # # filename: codemp.dylib - # steps: - # - uses: actions/checkout@v4 - # - uses: dtolnay/rust-toolchain@stable - # - uses: arduino/setup-protoc@v3 - # # this is the extra config required for lua - # - run: mkdir .cargo - # - run: echo '${{ vars.MLUA_CARGO_CONFIG_EXTRA_SETTINGS }}' > .cargo/config.toml - # # TODO can we make it prettier? - # - run: cargo build --release --features=lua - # - uses: actions/upload-artifact@v4 - # with: - # name: codemp-lua-${{ matrix.platform.target }} - # path: target/release/${{ matrix.platform.filename }} + build-macos: + runs-on: ${{ matrix.platform.runner }} + strategy: + fail-fast: false + matrix: + platform: + - runner: macos-14 + target: darwin-arm64 + filename: codemp.dylib + #- runner: macos-12 + # target: darwin-x64 + # filename: codemp.dylib + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - uses: arduino/setup-protoc@v3 + # this is the extra config required for lua + - run: mkdir .cargo + - run: echo '${{ vars.MLUA_CARGO_CONFIG_EXTRA_SETTINGS }}' > .cargo/config.toml + # TODO can we make it prettier? + - run: cargo build --release --features=lua + - uses: actions/upload-artifact@v4 + with: + name: codemp-lua-${{ matrix.platform.target }} + path: target/release/${{ matrix.platform.filename }} # TODO this just copies files on our server, maybe publish on luarocks? maybe do it properly with versions publish: runs-on: ubuntu-latest - needs: [build] + needs: [build, build-macos] steps: - uses: webfactory/ssh-agent@v0.9.0 with: