Skip to content

Commit 4e3932a

Browse files
graelograelo
authored
chore: merge pull request #39 from graelo/fix
Bump deps
2 parents 07d91e8 + 0f2f891 commit 4e3932a

File tree

8 files changed

+52
-155
lines changed

8 files changed

+52
-155
lines changed

‎.github/workflows/essentials.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
components: rustfmt, clippy
2323

2424
- name: Checkout
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626
with:
2727
ref: ${{ github.event.pull_request.head.sha }}
2828
fetch-depth: 0
2929
# fetch-depth: ${{ github.event.pull_request.commits }}
3030

3131
- name: Cache crates from crates.io
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
continue-on-error: false
3434
with:
3535
path: |

‎.github/workflows/large-scope.yml‎

Lines changed: 8 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
rust: [1.74.0, beta, nightly]
15+
rust: [1.78.0, beta, nightly]
1616

1717
steps:
1818
- name: Rust install
@@ -22,10 +22,10 @@ jobs:
2222
components: rustfmt, clippy
2323

2424
- name: Checkout
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626

2727
- name: Cache crates from crates.io
28-
uses: actions/cache@v4
28+
uses: actions/cache@v5
2929
continue-on-error: false
3030
with:
3131
path: |
@@ -34,7 +34,7 @@ jobs:
3434
~/.cargo/registry/cache/
3535
~/.cargo/git/db/
3636
target/
37-
key: '${{ runner.os }}-cargo-${{ matrix.rust }}-${{ hashFiles(''**/Cargo.lock'') }}'
37+
key: "${{ runner.os }}-cargo-${{ matrix.rust }}-${{ hashFiles('**/Cargo.lock') }}"
3838

3939
- name: Quality - cargo fmt
4040
run: |
@@ -44,48 +44,6 @@ jobs:
4444
run: |
4545
cargo clippy --all-targets --all-features -- -D warnings
4646
47-
# - name: Quality - convco check
48-
# run: |
49-
# git show-ref
50-
# curl -sSfLO https://github.com/convco/convco/releases/latest/download/convco-ubuntu.zip
51-
# unzip convco-ubuntu.zip
52-
# chmod +x convco
53-
# ./convco --version
54-
# ./convco check -c .convco
55-
# rm convco
56-
57-
# - name: Quality - cargo deny check
58-
# run: |
59-
# curl -sSfL https://github.com/EmbarkStudios/cargo-deny/releases/download/0.12.2/cargo-deny-0.12.2-x86_64-unknown-linux-musl.tar.gz | tar zx --no-anchored cargo-deny --strip-components=1
60-
# chmod +x cargo-deny
61-
# mv cargo-deny ~/.cargo/bin/
62-
# cargo deny check
63-
64-
# - name: Quality - cargo audit check
65-
# run: |
66-
# curl -sSfL https://github.com/rustsec/rustsec/releases/download/cargo-audit%2Fv0.17.3/cargo-audit-x86_64-unknown-linux-musl-v0.17.3.tgz | tar zx --no-anchored cargo-audit --strip-components=1
67-
# chmod +x cargo-audit
68-
# mv cargo-audit ~/.cargo/bin/
69-
# rm -rf ~/.cargo/advisory-db/
70-
# cargo audit --ignore RUSTSEC-2020-0071 # time-rs, but not used by chrono, see https://github.com/chronotope/chrono/issues/602
71-
72-
# - name: Quality - cargo outdated
73-
# timeout-minutes: 20
74-
# run: |
75-
# cargo install --locked cargo-outdated || true
76-
# rm -rf ~/.cargo/advisory-db
77-
# cargo outdated --exit-code 1
78-
79-
# - name: Quality - cargo udeps (needs nightly)
80-
# run: |
81-
# cargo install --locked cargo-udeps || true
82-
# cargo udeps
83-
84-
# - name: Quality - cargo pants
85-
# run: |
86-
# cargo install --locked cargo-pants || true
87-
# cargo pants
88-
8947
- name: Build (dev)
9048
run: cargo build --all-features
9149

@@ -101,18 +59,14 @@ jobs:
10159
strategy:
10260
matrix:
10361
include:
104-
- os: macos-13
62+
- os: macos-15-intel
10563
target: x86_64-apple-darwin
10664
type: unix
10765
toolchain: stable
10866
- os: macos-latest
10967
target: aarch64-apple-darwin
11068
type: unix
11169
toolchain: stable
112-
- os: windows-latest
113-
target: x86_64-pc-windows-msvc
114-
type: windows
115-
toolchain: stable
11670
steps:
11771
- name: Rust install
11872
uses: dtolnay/rust-toolchain@master
@@ -122,10 +76,10 @@ jobs:
12276
components: rustfmt, clippy
12377

12478
- name: Checkout
125-
uses: actions/checkout@v4
79+
uses: actions/checkout@v6
12680

12781
- name: Cache crates from crates.io
128-
uses: actions/cache@v4
82+
uses: actions/cache@v5
12983
continue-on-error: false
13084
with:
13185
path: |
@@ -134,57 +88,7 @@ jobs:
13488
~/.cargo/registry/cache/
13589
~/.cargo/git/db/
13690
target/
137-
key: '${{ runner.os }}-${{ matrix.target }}-cargo-stable-${{ hashFiles(''**/Cargo.lock'') }}'
138-
139-
# - name: Quality - cargo fmt
140-
# run: |
141-
# cargo fmt --all -- --check
142-
143-
# - name: Quality - cargo clippy
144-
# run: |
145-
# cargo clippy -- -D warnings
146-
147-
# - name: Quality - convco check
148-
# run: |
149-
# git show-ref
150-
# curl -sSfLO https://github.com/convco/convco/releases/latest/download/convco-ubuntu.zip
151-
# unzip convco-ubuntu.zip
152-
# chmod +x convco
153-
# ./convco --version
154-
# ./convco check -c .convco
155-
# rm convco
156-
157-
# - name: Quality - cargo deny check
158-
# run: |
159-
# curl -sSfL https://github.com/EmbarkStudios/cargo-deny/releases/download/0.12.2/cargo-deny-0.12.2-x86_64-unknown-linux-musl.tar.gz | tar zx --no-anchored cargo-deny --strip-components=1
160-
# chmod +x cargo-deny
161-
# mv cargo-deny ~/.cargo/bin/
162-
# cargo deny check
163-
164-
# - name: Quality - cargo audit check
165-
# run: |
166-
# curl -sSfL https://github.com/rustsec/rustsec/releases/download/cargo-audit%2Fv0.17.3/cargo-audit-x86_64-unknown-linux-musl-v0.17.3.tgz | tar zx --no-anchored cargo-audit --strip-components=1
167-
# chmod +x cargo-audit
168-
# mv cargo-audit ~/.cargo/bin/
169-
# rm -rf ~/.cargo/advisory-db/
170-
# cargo audit --ignore RUSTSEC-2020-0071 # time-rs, but not used by chrono, see https://github.com/chronotope/chrono/issues/602
171-
172-
# - name: Quality - cargo outdated
173-
# timeout-minutes: 20
174-
# run: |
175-
# cargo install --locked cargo-outdated || true
176-
# rm -rf ~/.cargo/advisory-db
177-
# cargo outdated --exit-code 1
178-
179-
# - name: Quality - cargo udeps (needs nightly)
180-
# run: |
181-
# cargo install --locked cargo-udeps || true
182-
# cargo udeps
183-
184-
# - name: Quality - cargo pants
185-
# run: |
186-
# cargo install --locked cargo-pants || true
187-
# cargo pants
91+
key: "${{ runner.os }}-${{ matrix.target }}-cargo-stable-${{ hashFiles('**/Cargo.lock') }}"
18892

18993
- name: Build (dev)
19094
run: cargo build --all-features

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ jobs:
2727
rust: stable
2828
suffix: ""
2929
archive_ext: tar.xz
30-
- os: windows-latest
31-
target: x86_64-pc-windows-msvc
32-
rust: stable
33-
suffix: .exe
34-
archive_ext: zip
3530
steps:
3631
- name: Rust install
3732
uses: dtolnay/rust-toolchain@master
@@ -40,12 +35,12 @@ jobs:
4035
components: rustfmt, clippy
4136

4237
- name: Checkout
43-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
4439
with:
4540
fetch-depth: 1
4641

4742
- name: Cache crates from crates.io
48-
uses: actions/cache@v4
43+
uses: actions/cache@v5
4944
continue-on-error: false
5045
with:
5146
path: |
@@ -63,10 +58,6 @@ jobs:
6358
if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-13' }}
6459
run: zip -A ${{ github.event.repository.name }}-${{ matrix.target }}.${{ matrix.archive_ext }} target/release/${{ github.event.repository.name }}
6560

66-
- name: Compress to zip (Windows)
67-
if: ${{ matrix.os == 'windows-latest' }}
68-
run: Compress-Archive target/release/${{ github.event.repository.name }}${{ matrix.suffix }} ${{ github.event.repository.name }}-${{ matrix.target }}.${{ matrix.archive_ext }}
69-
7061
- name: Compress to tar.xz (Linux)
7162
if: ${{ matrix.os == 'ubuntu-latest' }}
7263
run: tar Jcf ${{ github.event.repository.name }}-${{ matrix.target }}.${{ matrix.archive_ext }} target/release/${{ github.event.repository.name }}
@@ -93,7 +84,7 @@ jobs:
9384
- prepare-artifacts
9485
steps:
9586
- name: checkout
96-
uses: actions/checkout@v4
87+
uses: actions/checkout@v6
9788
with:
9889
# convco needs all history to create the changelog
9990
fetch-depth: 0

‎Cargo.lock‎

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

0 commit comments

Comments
 (0)