Skip to content

Commit

Permalink
CI: Update the expected memsize of the EntryInfo struct for Rust 1.66…
Browse files Browse the repository at this point in the history
… nightly

To workaround the following Cargo issue with cross compiling, force enable
rustc_version crate when testing Linux corss targets:
rust-lang/cargo#4423
  • Loading branch information
tatsuya6502 committed Oct 24, 2022
1 parent bc2c3a1 commit a178aab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .ci_extras/build_linux_cross.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fn main() {
use rustc_version::version;
let version = version().expect("Can't get the rustc version");
println!(
"cargo:rustc-env=RUSTC_SEMVER={}.{}",
version.major, version.minor
);
}
4 changes: 3 additions & 1 deletion .github/workflows/LinuxCrossCompileTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@ jobs:
target: ${{ matrix.platform.target }}
override: true

- name: Remove integration tests
- name: Remove integration tests and force enable rustc_version crate
run: |
rm -rf tests
sed -i '/actix-rt\|async-std\|reqwest\|skeptic/d' Cargo.toml
sed -i 's/target.*rustver.*\.//' Cargo.toml
sed -i 's/build = "build.rs"/build = ".ci_extras\/build_linux_cross.rs"/' Cargo.toml
cat Cargo.toml
- uses: Swatinem/rust-cache@v1
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"deqs",
"Deque",
"Deques",
"devcontainer",
"docsrs",
"Einziger",
"else's",
Expand Down

0 comments on commit a178aab

Please sign in to comment.