Skip to content

Commit

Permalink
Merge branch 'main' into read-split-index
Browse files Browse the repository at this point in the history
Hopefully fix the strange test failure around git-testtools being in an
unexpected version.
  • Loading branch information
Byron committed Dec 16, 2022
2 parents 2d90ad6 + 083909b commit c57bdde
Show file tree
Hide file tree
Showing 108 changed files with 1,145 additions and 528 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
toolchain: 1.65 # clippy is broken for us in 1.66
components: clippy,rustfmt
- name: Run cargo clippy
run: cargo clippy --all --tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:
echo "release version: $RELEASE_VERSION"
- name: Build release binary
run: ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }} --no-default-features --features ${{ matrix.feature }}
run: RUSTFLAGS="--cfg unsound_local_offset" ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }} --no-default-features --features ${{ matrix.feature }}

- name: Strip release binary (linux and macos)
if: matrix.build == 'linux' || matrix.build == 'macos'
Expand Down
Loading

0 comments on commit c57bdde

Please sign in to comment.