Skip to content

Commit

Permalink
Merge branch 'master' into add-colemak
Browse files Browse the repository at this point in the history
  • Loading branch information
kanru authored Mar 6, 2025
2 parents f58a851 + 2d0cdd7 commit 10e319d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ jobs:
- name: Setup rustup
run: |
rustup set auto-self-update disable
rustup install ${{ env.RUST_VERSION }}
rustup default ${{ env.RUST_VERSION }}
rustup update
- name: Build
run: |
Expand All @@ -68,9 +69,10 @@ jobs:
- uses: actions/checkout@v4
- name: Setup rustup
run: |
rustup set auto-self-update disable
rustup install ${{ env.RUST_VERSION }}
rustup default ${{ env.RUST_VERSION }}
rustup target add aarch64-unknown-linux-gnu
rustup update
- name: Build
run: |
Expand All @@ -96,6 +98,7 @@ jobs:
run: |
rustup-init -y
source "$HOME/.cargo/env"
rustup set auto-self-update disable
rustup component add llvm-tools
- name: Setup grcov
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if(NOT Corrosion_FOUND)
FetchContent_Declare(
Corrosion
GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
GIT_TAG 64289b1d79d6d19cd2e241db515381a086bb8407 # v0.5
GIT_TAG b1fab721655c5c4b1b08a083d3cd29f163af75d0 # v0.5.1
FIND_PACKAGE_ARGS
)
FetchContent_MakeAvailable(Corrosion)
Expand Down

0 comments on commit 10e319d

Please sign in to comment.