From 63865cef9d2970f5f2be5611880a0a6320fdabd1 Mon Sep 17 00:00:00 2001 From: Naoaki Iwakiri Date: Mon, 23 Sep 2024 14:55:34 +0900 Subject: [PATCH] Give up macos-12. The github actions doesn't support it well --- .github/workflows/continuous_testing.yaml | 42 ++++++++++------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/continuous_testing.yaml b/.github/workflows/continuous_testing.yaml index 24b8399..82a1745 100644 --- a/.github/workflows/continuous_testing.yaml +++ b/.github/workflows/continuous_testing.yaml @@ -65,7 +65,7 @@ jobs: name: library test strategy: matrix: - os: [ ubuntu-latest, macos-latest, macos-12 ] + os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@master @@ -119,11 +119,7 @@ jobs: brew install libxkbcommon echo `brew --prefix` - name: Build library - if: matrix.os != 'macos-12' run: cargo +stable cbuild - - name: Build library (macos intel) - if: matrix.os == 'macos-12' - run: $HOME/.cargo/bin/cargo +stable cbuild - name: copy shared data run: mkdir -p ~/.local/share/libcskk && cp -r ./assets/* ~/.local/share/libcskk # TODO: Use variable in github actions? Only target directory is different here. @@ -145,24 +141,24 @@ jobs: - name: Run lib test (Ubuntu) if: matrix.os == 'ubuntu-latest' run: LD_LIBRARY_PATH=./target/x86_64-unknown-linux-gnu/debug ./tests/lib_test - - name: copy header file (MacOS intel) - if: matrix.os == 'macos-12' - run: cp ./target/x86_64-apple-darwin/debug/libcskk.h ./tests/ - - name: link lib versioning (MacOS intel) - if: matrix.os == 'macos-12' - run: ln -fs libcskk.${{ steps.versions.outputs.version }}.dylib ./target/x86_64-apple-darwin/debug/libcskk.dylib - - name: Show built file (MacOS intel) - if: matrix.os == 'macos-12' - run: ls -l ./target/* - - name: Show built file under debug (MacOS intel) - if: matrix.os == 'macos-12' - run: ls -l ./target/x86_64-apple-darwin/debug/ - - name: Build lib test (MacOS intel) - if: matrix.os == 'macos-12' - run: gcc ./tests/c_shared_lib_test.c -L./target/x86_64-apple-darwin/debug/ -lcskk -lxkbcommon -o ./tests/lib_test - - name: Run lib test (MacOS intel) - if: matrix.os == 'macos-12' - run: DYLD_LIBRARY_PATH=./target/x86_64-apple-darwin/debug/ ./tests/lib_test +# - name: copy header file (MacOS intel) +# if: matrix.os == 'macos-12' +# run: cp ./target/x86_64-apple-darwin/debug/libcskk.h ./tests/ +# - name: link lib versioning (MacOS intel) +# if: matrix.os == 'macos-12' +# run: ln -fs libcskk.${{ steps.versions.outputs.version }}.dylib ./target/x86_64-apple-darwin/debug/libcskk.dylib +# - name: Show built file (MacOS intel) +# if: matrix.os == 'macos-12' +# run: ls -l ./target/* +# - name: Show built file under debug (MacOS intel) +# if: matrix.os == 'macos-12' +# run: ls -l ./target/x86_64-apple-darwin/debug/ +# - name: Build lib test (MacOS intel) +# if: matrix.os == 'macos-12' +# run: gcc ./tests/c_shared_lib_test.c -L./target/x86_64-apple-darwin/debug/ -lcskk -lxkbcommon -o ./tests/lib_test +# - name: Run lib test (MacOS intel) +# if: matrix.os == 'macos-12' +# run: DYLD_LIBRARY_PATH=./target/x86_64-apple-darwin/debug/ ./tests/lib_test - name: copy header file (MacOS M1) if: matrix.os == 'macos-latest' run: cp ./target/aarch64-apple-darwin/debug/libcskk.h ./tests/