diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c9d2647..cb2fe5d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + os: [windows-latest, ubuntu-latest, macos-13] abi: [x86_64, x86, arm64-v8a, armeabi-v7a] runs-on: ${{matrix.os}} @@ -50,16 +50,16 @@ jobs: - name: Install ${{matrix.abi}} run: cmake --install build/${{matrix.abi}} - name: Archive artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: android-${{matrix.os}} + name: android-${{matrix.os}}-${{matrix.abi}} path: ~/android/ test: timeout-minutes: 30 strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] abi: [x86_64] runs-on: ${{matrix.os}} @@ -75,7 +75,7 @@ jobs: | sudo tee /etc/udev/rules.d/99-kvm4all.rules sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true lfs: true @@ -84,7 +84,7 @@ jobs: - name: Build ${{matrix.abi}} run: cmake --build build/${{matrix.abi}} -v - name: AVD cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: avd-cache with: path: | @@ -113,7 +113,7 @@ jobs: disable-animations: true script: sh android.sh build test ${{matrix.abi}} - name: Archive artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: android-testsuite-${{matrix.os}}-${{matrix.abi}} path: build/${{matrix.abi}}/testsuite/log.txt diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 871e4a0..a0bb384 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,7 +21,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true lfs: true @@ -41,7 +41,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true lfs: true diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index c6fbbcb..6d8ebdc 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -24,16 +24,16 @@ jobs: steps: - name: get-cmake uses: lukka/get-cmake@v3.27.4 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true lfs: true - name: Build ${{matrix.abi}} run: sh ios.sh build build-non-fat ${{matrix.sdk}} ${{matrix.abi}} $BUILD_TYPE - name: Archive artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: build + name: build-${{matrix.sdk}}-${{matrix.abi}} path: build if-no-files-found: error install_and_test: @@ -43,29 +43,32 @@ jobs: steps: - name: get-cmake uses: lukka/get-cmake@v3.27.4 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true lfs: true - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 + with: + path: build + merge-multiple: true - name: Run simulator run: | - runtime=$(xcrun simctl list runtimes iOS -j | jq '.runtimes[].identifier' | tail -1) - udid=$(xcrun simctl list devices iPhone available -j | jq '.devices['$runtime']|.[].udid' | tail -1) - xcrun simctl bootstatus $(eval echo $udid) -b + runtime=$(xcrun simctl list runtimes iOS -j | jq '.runtimes|last.identifier') + udid=$(xcrun simctl list devices iPhone available -j | jq -r ".devices[$runtime]|last.udid") + xcrun simctl bootstatus $udid -b - name: Test - run: ctest --test-dir build/iphonesimulator-x86_64 -C $BUILD_TYPE + run: ctest --test-dir build/iphonesimulator-arm64 -C $BUILD_TYPE - name: Archive artifacts (testsuite) if: ${{failure()}} uses: actions/upload-artifact@v3 with: name: testsuite - path: ${{github.workspace}}/build/iphonesimulator-x86_64/ + path: ${{github.workspace}}/build/iphonesimulator-arm64/ - name: Install fat files and XCFrameworks run: sh ios.sh build install "$HOME/ios" --config $BUILD_TYPE - name: Archive artifacts (xcframework) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: xcframework path: ~/ios @@ -75,7 +78,7 @@ jobs: timeout-minutes: 30 if: ${{false}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true lfs: true @@ -86,14 +89,14 @@ jobs: - name: Install run: sh ios.sh build install $HOME/ios --config $BUILD_TYPE - name: Archive artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ios path: ~/ios/ - name: Run simulator run: | - runtime=$(xcrun simctl list runtimes iOS -j | jq '.runtimes[].identifier' | tail -1) - udid=$(xcrun simctl list devices iPhone available -j | jq '.devices['$runtime']|.[].udid' | tail -1) - xcrun simctl bootstatus $(eval echo $udid) -b + runtime=$(xcrun simctl list runtimes iOS -j | jq '.runtimes|last.identifier') + udid=$(xcrun simctl list devices iPhone available -j | jq -r ".devices[$runtime]|last.udid") + xcrun simctl bootstatus $udid -b - name: Test - run: ctest --test-dir build/iphonesimulator-x86_64 -C $BUILD_TYPE + run: ctest --test-dir build/iphonesimulator-arm64 -C $BUILD_TYPE diff --git a/testsuite/CMakeLists.txt b/testsuite/CMakeLists.txt index 9cc18b2..53a8907 100644 --- a/testsuite/CMakeLists.txt +++ b/testsuite/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(testsuite mimicssl-md5) include(GoogleTest) gtest_discover_tests(testsuite - DISCOVERY_TIMEOUT 50 + DISCOVERY_TIMEOUT 500 DISCOVERY_MODE PRE_TEST)