Skip to content

Commit b9dea66

Browse files
committed
Merge #836: 10.x: fix CI
4842494 Check that we only accept INPUT_CHARSET in from_str (Andrew Poelstra) a0e3221 ci: update rustc version for fuzz job (Andrew Poelstra) 4f03d30 clippy: fix reference-related syntax stuff (Andrew Poelstra) fd102f4 clippy: remove a bunch of unnecessary vec!s (Andrew Poelstra) e3889d2 clippy: non-reference stuff (Andrew Poelstra) 6afde54 modernize rustfmt::skip syntax and run cargo fmt (Andrew Poelstra) 5cb768b ci: fix broken and redundant doc links (Andrew Poelstra) 972756f ci: set all runners to ubuntu-latest (Andrew Poelstra) 085f13f ci: pin nightly version (Andrew Poelstra) b57c9a7 ci: pin dependencies using lockfile rather than ad-hoc cargo updates (Andrew Poelstra) Pull request description: Should get us green CI, and pins the nightly compiler version so that it stays green. ACKs for top commit: sanket1729: reACK 4842494. Tree-SHA512: b3ce8620e45b6dd378391611321d5b50645ac9850ac3bc50bb2ade32df83928d94ac158d35117c2655c7fd34618d13b66cd2edbe636f4202ff5ec3037d3ce95e
2 parents 73473b5 + 4842494 commit b9dea66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+818
-300
lines changed

.github/workflows/fuzz.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
fuzz:
1313
if: ${{ !github.event.act }}
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
strategy:
1616
fail-fast: false
1717
matrix:
@@ -28,8 +28,8 @@ roundtrip_semantic,
2828
steps:
2929
- name: Install test dependencies
3030
run: sudo apt-get update -y && sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
31-
- uses: actions/checkout@v2
32-
- uses: actions/cache@v2
31+
- uses: actions/checkout@v4
32+
- uses: actions/cache@v4
3333
id: cache-fuzz
3434
with:
3535
path: |
@@ -39,13 +39,13 @@ roundtrip_semantic,
3939
key: cache-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
4040
- uses: actions-rs/toolchain@v1
4141
with:
42-
toolchain: 1.58
42+
toolchain: 1.65
4343
override: true
4444
profile: minimal
4545
- name: fuzz
4646
run: cd fuzz && ./fuzz.sh "${{ matrix.fuzz_target }}"
4747
- run: echo "${{ matrix.fuzz_target }}" >executed_${{ matrix.fuzz_target }}
48-
- uses: actions/upload-artifact@v2
48+
- uses: actions/upload-artifact@v4
4949
with:
5050
name: executed_${{ matrix.fuzz_target }}
5151
path: executed_${{ matrix.fuzz_target }}
@@ -55,8 +55,8 @@ roundtrip_semantic,
5555
needs: fuzz
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v2
59-
- uses: actions/download-artifact@v2
58+
- uses: actions/checkout@v4
59+
- uses: actions/download-artifact@v4
6060
- name: Display structure of downloaded files
6161
run: ls -R
6262
- run: find executed_* -type f -exec cat {} + | sort > executed

.github/workflows/rust.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,29 @@ on: [push, pull_request]
33
name: Continuous integration
44

55
jobs:
6+
Prepare:
7+
runs-on: ubuntu-latest
8+
outputs:
9+
nightly_version: ${{ steps.read_toolchain.outputs.nightly_version }}
10+
steps:
11+
- name: "Checkout repo"
12+
uses: actions/checkout@v4
13+
- name: "Read nightly version"
14+
id: read_toolchain
15+
run: echo "nightly_version=$(cat nightly-version)" >> $GITHUB_OUTPUT
16+
617
Nightly:
718
name: Nightly - Bench + Docs + Fmt
19+
needs: Prepare
820
runs-on: ubuntu-latest
921
steps:
1022
- name: Checkout Crate
11-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
1224
- name: Checkout Toolchain
1325
uses: actions-rs/toolchain@v1
1426
with:
1527
profile: minimal
16-
toolchain: nightly
28+
toolchain: ${{ needs.Prepare.outputs.nightly_version }}
1729
override: true
1830
- name: Running benchmarks
1931
env:
@@ -33,7 +45,7 @@ jobs:
3345
runs-on: ubuntu-latest
3446
steps:
3547
- name: Checkout Crate
36-
uses: actions/checkout@v2
48+
uses: actions/checkout@v4
3749
- name: Checkout Toolchain
3850
uses: actions-rs/toolchain@v1
3951
with:
@@ -47,18 +59,18 @@ jobs:
4759

4860
Tests:
4961
name: Tests
62+
needs: Prepare
5063
runs-on: ubuntu-latest
5164
strategy:
5265
matrix:
5366
include:
5467
- rust: stable
5568
- rust: beta
56-
- rust: nightly
5769
- rust: 1.41.1
58-
- rust: 1.47
70+
- rust: ${{ needs.Prepare.outputs.nightly_version }}
5971
steps:
6072
- name: Checkout Crate
61-
uses: actions/checkout@v2
73+
uses: actions/checkout@v4
6274
- name: Checkout Toolchain
6375
uses: actions-rs/toolchain@v1
6476
with:
@@ -72,22 +84,23 @@ jobs:
7284
run: ./contrib/test.sh
7385

7486
Embedded:
87+
needs: Prepare
7588
runs-on: ubuntu-latest
7689
steps:
7790
- name: Checkout
78-
uses: actions/checkout@v2
91+
uses: actions/checkout@v4
7992
- name: Set up QEMU
8093
run: sudo apt update && sudo apt install -y qemu-system-arm gcc-arm-none-eabi
8194
- name: Checkout Toolchain
8295
uses: actions-rs/toolchain@v1
8396
with:
8497
profile: minimal
85-
toolchain: nightly
98+
toolchain: ${{ needs.Prepare.outputs.nightly_version }}
8699
override: true
87100
components: rust-src
88101
target: thumbv7m-none-eabi
89102
- name: Run
90103
env:
91104
RUSTFLAGS: "-C link-arg=-Tlink.x"
92105
CARGO_TARGET_THUMBV7M_NONE_EABI_RUNNER: "qemu-system-arm -cpu cortex-m3 -machine mps2-an385 -nographic -semihosting-config enable=on,target=native -kernel"
93-
run: cd embedded && cargo run --target thumbv7m-none-eabi --release
106+
run: cp Cargo-recent.lock Cargo.lock && cd embedded && cargo run --target thumbv7m-none-eabi --release

0 commit comments

Comments
 (0)