Skip to content

Commit

Permalink
CI fixes (#93)
Browse files Browse the repository at this point in the history
Get CI working again: remove the self hosted armv7 runner, and apt-get update on bsd.
  • Loading branch information
benfred authored Oct 25, 2024
1 parent da71775 commit b416894
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ jobs:
- uses: actions/setup-python@v4
- uses: pre-commit/[email protected]

build-linux-armv7:
runs-on: [self-hosted, linux, arm]
needs: [lint]
steps:
- uses: actions/checkout@v2
- name: Build
run: cargo build --verbose --examples --features unwind
- name: Run tests
run: cargo test --verbose --features unwind

build-mac:
runs-on: macos-latest
needs: [lint]
Expand Down Expand Up @@ -105,6 +95,7 @@ jobs:
run: lscpu
- name: Install VM tools
run: |
sudo apt-get update -qq
sudo apt-get install -qq -o=Dpkg::Use-Pty=0 moreutils
sudo chronic apt-get install -qq -o=Dpkg::Use-Pty=0 vagrant virtualbox qemu libvirt-daemon-system
- name: Set up VM
Expand Down
2 changes: 2 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::env;

fn main() {
println!("cargo::rustc-check-cfg=cfg(use_libunwind)");

// We only support native unwinding on some platforms
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
match target_arch.as_str() {
Expand Down
2 changes: 1 addition & 1 deletion ci/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Vagrant.configure("2") do |config|
chsh -s /usr/local/bin/bash vagrant
pw groupmod wheel -m vagrant
su -l vagrant <<'EOF'
curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain 1.73.0
curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain 1.81.0
EOF
SHELL
end

0 comments on commit b416894

Please sign in to comment.