Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update from upstream #169

Merged
merged 17 commits into from
Jul 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
28a0d46
chore(deps): bump rust from 1.61.0 to 1.62.0
dependabot[bot] Jul 1, 2022
e9b4da4
Merge pull request #316 from kristof-mattei/dependabot/docker/rust-1.…
github-actions[bot] Jul 1, 2022
628756b
feat: more rust 1.62
kristof-mattei Jul 1, 2022
f048ac0
chore: and more 1.62
kristof-mattei Jul 1, 2022
59830b2
Merge pull request #318 from kristof-mattei/more-rust-1.62
kristof-mattei Jul 1, 2022
ddf6fc7
chore: try to speed up by using binstall
kristof-mattei Jul 3, 2022
56fb4b2
Merge remote-tracking branch 'origin/main' into try-with-binstall
kristof-mattei Jul 3, 2022
e700aaa
chore: fix the binary names
kristof-mattei Jul 3, 2022
c4daf59
chore: spacing, made lint-commits also use binstall
kristof-mattei Jul 3, 2022
5dc80a3
Merge pull request #319 from kristof-mattei/try-with-binstall
kristof-mattei Jul 3, 2022
c861d40
chore(deps): bump dependabot/fetch-metadata from 1.3.1 to 1.3.3
dependabot[bot] Jul 3, 2022
05d91ca
Merge pull request #320 from kristof-mattei/dependabot/github_actions…
github-actions[bot] Jul 3, 2022
2ac4f9d
chore(deps): bump EnricoMi/publish-unit-test-result-action
dependabot[bot] Jul 5, 2022
73a0ad7
chore: updated file property to junit_files as per https://github.com…
kristof-mattei Jul 7, 2022
f77d869
Merge pull request #321 from kristof-mattei/dependabot/github_actions…
kristof-mattei Jul 7, 2022
015449f
Merge remote-tracking branch 'upstream/main' into update-from-upstream
kristof-mattei Jul 7, 2022
29e95a4
Merge branch 'main' into update-from-upstream
kristof-mattei Jul 7, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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"