Skip to content

Commit

Permalink
test: CI updates (#396)
Browse files Browse the repository at this point in the history
* add macos-14 to FFI CI matrix
* update corrosion submodule
* update cmake version in github work flow
  • Loading branch information
molpopgen committed May 7, 2024
1 parent 5d5fe3d commit 2bbae99
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_ffi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-13]
os: [ubuntu-latest, macos-13, macos-14]
rust:
- stable

Expand All @@ -31,7 +31,7 @@ jobs:
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2.0
with:
cmake-version: '3.16.x'
cmake-version: '3.22.x'
- uses: Swatinem/rust-cache@v2
- name: Install cbindgen
uses: baptiste0928/cargo-install@v3
Expand Down
2 changes: 1 addition & 1 deletion demes-forward-capi/c_example/corrosion
Submodule corrosion updated 80 files
+1 −0 .github/FUNDING.yml
+81 −0 .github/ISSUE_TEMPLATE/bug_report.yml
+0 −183 .github/actions/setup_test/action.yaml
+5 −0 .github/scripts/toolchains/aarch64-apple-darwin-clang.cmake
+4 −0 .github/scripts/toolchains/aarch64-unknown-linux-gnu-clang.cmake
+3 −0 .github/scripts/toolchains/aarch64-unknown-linux-gnu-gcc.cmake
+4 −0 .github/scripts/toolchains/i686-unknown-linux-gnu-clang.cmake
+3 −0 .github/scripts/toolchains/i686-unknown-linux-gnu-gcc.cmake
+7 −0 .github/scripts/toolchains/x86_64-apple-darwin-clang.cmake
+3 −0 .github/scripts/toolchains/x86_64-pc-windows-gnu-clang.cmake
+3 −0 .github/scripts/toolchains/x86_64-unknown-linux-gnu-clang.cmake
+3 −0 .github/scripts/toolchains/x86_64-unknown-linux-gnu-gcc.cmake
+78 −0 .github/workflows/gh-pages.yaml
+58 −0 .github/workflows/linux.yaml
+251 −201 .github/workflows/test.yaml
+0 −80 .github/workflows/test_legacy.yaml
+53 −0 .github/workflows/visual_studio.yaml
+19 −63 CMakeLists.txt
+316 −0 CMakePresets.json
+20 −402 README.md
+196 −7 RELEASES.md
+0 −5 bors.toml
+684 −566 cmake/Corrosion.cmake
+1 −10 cmake/CorrosionConfig.cmake.in
+130 −62 cmake/CorrosionGenerator.cmake
+288 −16 cmake/FindRust.cmake
+1 −0 doc/.gitignore
+5 −0 doc/book.toml
+9 −0 doc/src/SUMMARY.md
+100 −0 doc/src/advanced.md
+88 −0 doc/src/common_issues.md
+43 −0 doc/src/ffi_bindings.md
+19 −0 doc/src/introduction.md
+36 −0 doc/src/quick_start.md
+89 −0 doc/src/setup_corrosion.md
+310 −0 doc/src/usage.md
+0 −182 generator/Cargo.lock
+0 −17 generator/Cargo.toml
+0 −79 generator/src/main.rs
+0 −114 generator/src/subcommands/gen_cmake.rs
+0 −198 generator/src/subcommands/gen_cmake/target.rs
+0 −14 generator/src/subcommands/print_root.rs
+24 −19 test/CMakeLists.txt
+24 −20 test/ConfigureAndBuild.cmake
+11 −0 test/cbindgen/CMakeLists.txt
+10 −0 test/cbindgen/rust2cpp/CMakeLists.txt
+22 −0 test/cbindgen/rust2cpp/main.cpp
+7 −0 test/cbindgen/rust2cpp/rust/Cargo.lock
+10 −0 test/cbindgen/rust2cpp/rust/Cargo.toml
+4 −0 test/cbindgen/rust2cpp/rust/cbindgen.toml
+3 −0 test/cbindgen/rust2cpp/rust/src/ffi.rs
+33 −0 test/cbindgen/rust2cpp/rust/src/lib.rs
+1 −0 test/cbindgen/rust2cpp/rust/src/other_mod/mod.rs
+4 −0 test/cpp2rust/cpp2rust/rust/build.rs
+5 −9 test/cxxbridge/CMakeLists.txt
+14 −3 test/cxxbridge/cxxbridge_cpp2rust/CMakeLists.txt
+3 −4 test/cxxbridge/cxxbridge_cpp2rust/cpplib.cpp
+1 −0 test/cxxbridge/cxxbridge_cpp2rust/rust/src/main.rs
+5 −0 test/cxxbridge/cxxbridge_rust2cpp/CMakeLists.txt
+0 −14 test/external_corrosion_generator/CMakeLists.txt
+0 −18 test/external_corrosion_generator/ExternalCorrosionGenerator/CMakeLists.txt
+0 −14 test/external_corrosion_generator/ExternalCorrosionGenerator/Test.cmake
+1 −0 test/find_rust/CMakeLists.txt
+47 −0 test/find_rust/rustup_proxy/CMakeLists.txt
+1 −1 test/gensource/gensource/generator/CMakeLists.txt
+2 −7 test/hostbuild/CMakeLists.txt
+25 −11 test/output directory/CMakeLists.txt
+14 −0 test/output directory/output directory/CMakeLists.txt
+7 −0 test/output directory/output directory/proj3/Cargo.lock
+11 −0 test/output directory/output directory/proj3/Cargo.toml
+3 −0 test/output directory/output directory/proj3/src/bin/rust_bin3.rs
+4 −0 test/output directory/output directory/proj3/src/lib.rs
+5 −0 test/parse_target_triple/CMakeLists.txt
+8 −7 test/parse_target_triple/parse_target_triple/CMakeLists.txt
+0 −1 test/parse_target_triple/parse_target_triple/Cargo.toml
+1 −5 test/parse_target_triple/parse_target_triple_should_fail/CMakeLists.txt
+0 −1 test/parse_target_triple/parse_target_triple_should_fail/Cargo.toml
+4 −0 test/rust2cpp/rust2cpp/rust/build.rs
+24 −1 test/workspace/workspace/CMakeLists.txt
+3 −0 test/workspace/workspace/Cargo.toml

0 comments on commit 2bbae99

Please sign in to comment.