Skip to content

Commit

Permalink
Merge branch 'master' into configs
Browse files Browse the repository at this point in the history
  • Loading branch information
chenyan-dfinity authored May 8, 2024
2 parents 511629b + b0622bb commit a976463
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: run benchmark
runs-on: ubuntu-latest
env:
RUSTC_VERSION: 1.75.0
RUSTC_VERSION: 1.77.0
steps:
- uses: actions/checkout@v4
- name: Checkout base branch
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
~/.cargo
target
rust/bench/target
key: ${{ runner.os }}-bench-0.1.1-${{ hashFiles('**/Cargo.lock') }}
key: ${{ runner.os }}-bench-0.1.3-${{ hashFiles('**/Cargo.lock') }}
- name: Install canbench
run: cargo install canbench
- name: Run perf for base branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v12
#- run: nix-build s coq
# The above would also build the shell, includling niv.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
tags:
- '*'
branches: # TODO: Remove before merging.
- musl # Pushing the feature branch should test this PR.
- fix-ci # Pushing the feature branch should test this PR.
jobs:
build:
name: Build for ${{ matrix.name }}
Expand All @@ -17,7 +17,7 @@ jobs:
name: linux64
artifact_name: target/x86_64-unknown-linux-musl/release/didc
asset_name: didc-linux64
- os: macos-latest
- os: macos-12
name: macos
artifact_name: target/release/didc
asset_name: didc-macos
Expand All @@ -26,7 +26,7 @@ jobs:
artifact_name: target/arm-unknown-linux-gnueabihf/release/didc
asset_name: didc-arm32
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install stable toolchain
if: matrix.name != 'arm'
uses: actions-rs/toolchain@v1
Expand Down

0 comments on commit a976463

Please sign in to comment.