Skip to content

Commit bb73c0b

Browse files
authored
Merge pull request aya-rs#28 from vadorovsky/fix-tests
cli: Fix parsing of `--export` flags
2 parents 27b4a38 + 17159a9 commit bb73c0b

File tree

7 files changed

+164
-80
lines changed

7 files changed

+164
-80
lines changed

.github/workflows/build-test.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
rust:
21-
- "1.63.0"
21+
- "stable"
2222
- "beta"
2323
- "nightly"
2424
llvm: ["15", "rustc"]
@@ -75,6 +75,15 @@ jobs:
7575
sudo apt-get update
7676
sudo apt-get install llvm-${{ matrix.llvm }}-dev libclang-${{ matrix.llvm }}-dev
7777
78+
- name: Install LLVM tools
79+
if: matrix.llvm == 'rustc'
80+
shell: bash
81+
run: |
82+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
83+
echo -e "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main\n" | sudo tee /etc/apt/sources.list.d/llvm.list
84+
sudo apt-get update
85+
sudo apt-get install llvm-15-tools
86+
7887
- name: Build
7988
run: cargo build --verbose ${CARGO_ARGS}
8089

.github/workflows/lint.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,24 @@ env:
1414
CARGO_TERM_COLOR: always
1515

1616
jobs:
17-
lint:
17+
lint-stable:
18+
runs-on: ubuntu-20.04
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
23+
- uses: actions-rs/toolchain@v1
24+
with:
25+
profile: minimal
26+
toolchain: stable
27+
components: clippy, rust-src
28+
override: true
29+
30+
- name: Run clippy
31+
run: |
32+
cargo clippy --workspace -- --deny warnings
33+
34+
lint-nightly:
1835
runs-on: ubuntu-20.04
1936

2037
steps:
@@ -24,12 +41,9 @@ jobs:
2441
with:
2542
profile: minimal
2643
toolchain: nightly
27-
components: rustfmt, clippy, miri, rust-src
44+
components: rustfmt, rust-src
2845
override: true
2946

3047
- name: Check formatting
3148
run: |
3249
cargo fmt --all -- --check
33-
- name: Run clippy
34-
run: |
35-
cargo clippy --workspace -- --deny warnings

Cargo.lock

Lines changed: 29 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2021"
1212

1313
[dependencies]
1414
# cli deps
15-
clap = { version = "3.2", optional = true, features = ["derive"] }
15+
clap = { version = "4.0", optional = true, features = ["derive"] }
1616
simplelog = {version = "0.7.6", optional = true}
1717

1818
# lib deps

0 commit comments

Comments
 (0)