Skip to content

Commit

Permalink
Merge pull request #169 from kristof-mattei/update-from-upstream
Browse files Browse the repository at this point in the history
update from upstream
  • Loading branch information
kristof-mattei committed Jul 7, 2022
2 parents c269485 + 29e95a4 commit 265dc64
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 8 deletions.
20 changes: 16 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,27 @@ jobs:
run: |
rustup component add llvm-tools-preview
- name: Get binstall
shell: bash
run: |
archive="cargo-binstall-x86_64-unknown-linux-musl.tgz"
wget "https://github.com/ryankurte/cargo-binstall/releases/latest/download/${archive}"
tar -xvf "./${archive}"
rm "./${archive}"
mv ./cargo-binstall ~/.cargo/bin/
- name: Install nextest, custom test runner, with native support for junit
shell: bash
run: |
cargo install --locked cargo-nextest;
cargo binstall --no-confirm cargo-nextest;
- name: Install grcov
shell: bash
run: |
cargo install --locked grcov;
cargo binstall --no-confirm grcov --pkg-url "{ repo }/releases/download/v{ version }/{ name }-{ target }.tar.bz2" --pkg-fmt tbz2 --bin-dir "{ bin }";
- name: Build with instrumentation support
shell: bash
Expand All @@ -184,11 +196,11 @@ jobs:
continue-on-error: true

- name: Upload test results
uses: EnricoMi/publish-unit-test-result-action@f00bb47e1d89c6d98071d1b69e16a2b63c7fbfc1
uses: EnricoMi/publish-unit-test-result-action@7a453e7e81ac3190db44d6a0cf3ab2811b12cf11
with:
check_name: Test results
github_token: ${{ secrets.GITHUB_TOKEN }}
files: reports/results.xml
junit_files: reports/results.xml

- name: Run grcov
shell: bash
Expand Down
17 changes: 15 additions & 2 deletions .github/workflows/lint-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,22 @@ jobs:
cargo --version
- name: Install cocogitto for commit linting
- name: Get binstall
shell: bash
run: |
archive="cargo-binstall-x86_64-unknown-linux-musl.tgz"
wget "https://github.com/ryankurte/cargo-binstall/releases/latest/download/${archive}"
tar -xvf "./${archive}"
rm "./${archive}"
mv ./cargo-binstall ~/.cargo/bin/
- name: Install cocogitto to get the next version number
shell: bash
run: |
cargo install --locked cocogitto;
cargo binstall --no-confirm cocogitto --pkg-url "{ repo }/releases/download/{ version }/{ name }-{ version }-{ target }.tar.gz" --bin-dir "{ bin }";
- name: Check the commits
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "leetcode"
# don't change this, it's updated before an actual build by update-version.sh
version = "0.0.0-development"
edition = "2021"
rust-version = "1.61.0"
rust-version = "1.62.0"
authors = ["Kristof Mattei"]
license-file = "LICENSE"
description = "Leet Code"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.61.0"
channel = "stable"
components = [ "cargo", "clippy", "rustfmt" ]
profile = "minimal"

0 comments on commit 265dc64

Please sign in to comment.