From 1b24130c5f21e598fd6f579bc964bdae2d4cae8b Mon Sep 17 00:00:00 2001 From: Abdelrahman Ashraf Date: Mon, 7 Oct 2024 15:17:15 +0700 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20thorvg=20to?= =?UTF-8?q?=20v0.15.0=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 🤖 upgrade thorvg to v0.15.0 --- .../choredependencies_upgrade_thorvg_v0150.md | 5 ++ .github/workflows/check-pr.yaml | 46 ++++++++++--------- deps/modules/thorvg | 2 +- dotlottie-rs/conanfile.txt | 2 +- 4 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 .changeset/choredependencies_upgrade_thorvg_v0150.md diff --git a/.changeset/choredependencies_upgrade_thorvg_v0150.md b/.changeset/choredependencies_upgrade_thorvg_v0150.md new file mode 100644 index 00000000..77096b51 --- /dev/null +++ b/.changeset/choredependencies_upgrade_thorvg_v0150.md @@ -0,0 +1,5 @@ +--- +default: minor +--- + +# chore(dependencies): 🤖 upgrade thorvg v0.15.0 diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml index b9e656fe..8761d718 100644 --- a/.github/workflows/check-pr.yaml +++ b/.github/workflows/check-pr.yaml @@ -3,36 +3,40 @@ name: Check PR on: pull_request: branches: [main] + push: + branches: [main] jobs: check-pr: if: github.head_ref != 'release' - runs-on: macos-12 + runs-on: ubuntu-latest steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} + - uses: actions/checkout@v4 - - uses: Homebrew/actions/setup-homebrew@master - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: "13.3.1" - - uses: ningenMe/setup-rustup@v1.1.0 - - uses: turtlebrowser/get-conan@main - - name: Install Make - run: brew install make - - name: Build Setup - run: make mac-setup - - name: Build Artifacts - env: - APPLE_XCODE_APP_NAME: Xcode_13.3.1.app - APPLE_MACOSX_SDK: MacOSX12.3 - run: make demo-player - - name: Run Tests - run: make test - - name: Run Clippy - run: make clippy - # Make sure CI fails on all warnings, including Clippy lints + + - name: Setup Rust + uses: ningenMe/setup-rustup@v1.1.0 + + - name: Setup Conan + uses: turtlebrowser/get-conan@main + + - name: Build + run: | + cargo build --manifest-path=./dotlottie-rs/Cargo.toml --release + cargo build --manifest-path=./dotlottie-ffi/Cargo.toml --release + + - name: Test + run: | + cargo test --manifest-path=./dotlottie-rs/Cargo.toml --release -- --test-threads=1 + cargo test --manifest-path=./dotlottie-ffi/Cargo.toml --release -- --test-threads=1 + + - name: Lint + run: | + cargo clippy --manifest-path=./dotlottie-rs/Cargo.toml --all-targets --all-features -- -D clippy::print_stdout + cargo clippy --manifest-path=./dotlottie-ffi/Cargo.toml --all-targets --all-features -- -D clippy::print_stdout env: RUSTFLAGS: "-Dwarnings" diff --git a/deps/modules/thorvg b/deps/modules/thorvg index 81a0fbfd..c9960fcc 160000 --- a/deps/modules/thorvg +++ b/deps/modules/thorvg @@ -1 +1 @@ -Subproject commit 81a0fbfd590873b21e53c3af77969c71d3d9b586 +Subproject commit c9960fcc93ce7325a563af6c3cb6dffc71c86ebe diff --git a/dotlottie-rs/conanfile.txt b/dotlottie-rs/conanfile.txt index 25c132dc..265d56f2 100644 --- a/dotlottie-rs/conanfile.txt +++ b/dotlottie-rs/conanfile.txt @@ -1,2 +1,2 @@ [requires] -thorvg/0.14.6 +thorvg/0.14.10