summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2023-07-05 11:39:15 -0400
committerAndrew Gallant <jamslam@gmail.com>2023-07-05 14:04:29 -0400
commit0b6eccf4d34277ea254d32babae6420d5c7360c8 (patch)
treecdf0042f8595a0633138537422ff5267a708dbdb
parent3ac4541e9fb83ba4fc67dbbd26082d0523e87743 (diff)
ci: try to fix CI
-rw-r--r--.github/workflows/ci.yml26
-rw-r--r--Cross.toml1
2 files changed, 14 insertions, 13 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63c10612..9c1e563d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,31 +42,31 @@ jobs:
- win-gnu
include:
- build: pinned
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: 1.70.0
- build: stable
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: stable
- build: beta
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: beta
- build: nightly
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
- build: nightly-musl
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
target: x86_64-unknown-linux-musl
- build: nightly-32
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
target: i686-unknown-linux-gnu
- build: nightly-mips
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
target: mips64-unknown-linux-gnuabi64
- build: nightly-arm
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
# For stripping release binaries:
# docker run --rm -v $PWD/target:/target:Z \
@@ -75,7 +75,7 @@ jobs:
# /target/arm-unknown-linux-gnueabihf/debug/rg
target: arm-unknown-linux-gnueabihf
- build: macos
- os: macos-12
+ os: macos-latest
rust: nightly
- build: win-msvc
os: windows-2022
@@ -88,12 +88,12 @@ jobs:
uses: actions/checkout@v3
- name: Install packages (Ubuntu)
- if: matrix.os == 'ubuntu-22.04'
+ if: matrix.os == 'ubuntu-latest'
run: |
ci/ubuntu-install-packages
- name: Install packages (macOS)
- if: matrix.os == 'macos-12'
+ if: matrix.os == 'macos-latest'
run: |
ci/macos-install-packages
@@ -178,7 +178,7 @@ jobs:
rustfmt:
name: rustfmt
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
@@ -192,7 +192,7 @@ jobs:
docs:
name: Docs
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
diff --git a/Cross.toml b/Cross.toml
index 3b0e4caa..220e304b 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -6,6 +6,7 @@ image = "burntsushi/cross:i686-unknown-linux-gnu"
[target.mips64-unknown-linux-gnuabi64]
image = "burntsushi/cross:mips64-unknown-linux-gnuabi64"
+build-std = true
[target.arm-unknown-linux-gnueabihf]
image = "burntsushi/cross:arm-unknown-linux-gnueabihf"