forked from tikv/pprof-rs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Bump the MSRV to 1.64.0 Signed-off-by: hi-rustin <[email protected]> * Update toolchain Signed-off-by: hi-rustin <[email protected]> * Remove useless mv Signed-off-by: hi-rustin <[email protected]> --------- Signed-off-by: hi-rustin <[email protected]>
- Loading branch information
1 parent
1f4ef09
commit 5fac2a2
Showing
3 changed files
with
19 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,10 +19,10 @@ jobs: | |
uses: actions-rs/[email protected] | ||
with: | ||
profile: minimal | ||
toolchain: 1.56.1 | ||
toolchain: 1.64.0 | ||
override: true | ||
components: rustfmt, clippy | ||
|
||
- name: Install protobuf compiler | ||
run: sudo apt-get install -y protobuf-compiler | ||
|
||
|
@@ -35,12 +35,6 @@ jobs: | |
- name: Remove pre-generated prost files to force regeneration | ||
run: rm proto/*.rs | ||
|
||
- name: Specify dependency version for old Rust | ||
run: | | ||
cp Cargo.toml Cargo.toml.bak | ||
sed -i "s|inferno = { version = \"0.11\"|inferno = { version = \"=0.11.1\"|g" ./Cargo.toml | ||
sed -i "s|criterion = \"0.4\"|criterion = \"=0.3.0\"\ncsv = \"=1.1.0\"|g" Cargo.toml | ||
- name: Run cargo clippy prost | ||
uses: actions-rs/[email protected] | ||
with: | ||
|
@@ -55,22 +49,22 @@ jobs: | |
|
||
- name: Check if the prost file committed to git is up-to-date | ||
run: | | ||
mv Cargo.toml.bak Cargo.toml | ||
git diff --no-ext-diff --exit-code | ||
build: | ||
name: Build | ||
strategy: | ||
matrix: | ||
os: [ubuntu-latest, macos-latest] | ||
toolchain: [stable, nightly, 1.56.1] | ||
target: [ | ||
x86_64-unknown-linux-gnu, | ||
aarch64-unknown-linux-gnu, | ||
x86_64-unknown-linux-musl, | ||
x86_64-apple-darwin, | ||
aarch64-apple-darwin, | ||
] | ||
toolchain: [stable, nightly, 1.64.0] | ||
target: | ||
[ | ||
x86_64-unknown-linux-gnu, | ||
aarch64-unknown-linux-gnu, | ||
x86_64-unknown-linux-musl, | ||
x86_64-apple-darwin, | ||
aarch64-apple-darwin, | ||
] | ||
exclude: | ||
- os: ubuntu-latest | ||
target: x86_64-apple-darwin | ||
|
@@ -97,13 +91,6 @@ jobs: | |
target: ${{ matrix.target }} | ||
override: true | ||
|
||
- name: Specify dependency version for old Rust | ||
if: ${{ matrix.toolchain == '1.56.1' }} | ||
run: | | ||
# sed -i is not compatible with Mac OS | ||
mv Cargo.toml Cargo.toml.bak | ||
sed "s|inferno = { version = \"0.11\"|inferno = { version = \"=0.11.1\"|g" Cargo.toml.bak > ./Cargo.toml | ||
- name: Run cargo build prost | ||
uses: actions-rs/[email protected] | ||
with: | ||
|
@@ -129,11 +116,12 @@ jobs: | |
matrix: | ||
os: [ubuntu-latest, macos-latest] | ||
toolchain: [stable, nightly] | ||
target: [ | ||
x86_64-unknown-linux-gnu, | ||
x86_64-unknown-linux-musl, | ||
x86_64-apple-darwin, | ||
] | ||
target: | ||
[ | ||
x86_64-unknown-linux-gnu, | ||
x86_64-unknown-linux-musl, | ||
x86_64-apple-darwin, | ||
] | ||
exclude: | ||
- os: ubuntu-latest | ||
target: x86_64-apple-darwin | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters