Skip to content

Commit cc1dfb2

Browse files
committed
Update nightly version with support for edition2024; Use stable sha2 crate
1 parent b0cf9a4 commit cc1dfb2

File tree

2 files changed

+36
-64
lines changed

2 files changed

+36
-64
lines changed

.github/workflows/rust.yml

Lines changed: 35 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ on:
66
pull_request:
77

88
env:
9-
# Non-secret environment variables
109
PDS_EMAIL_FROM_ADDRESS: "noreply@blacksky.app"
1110
PDS_EMAIL_FROM_NAME: "noreply"
1211
PDS_MODERATION_EMAIL_FROM_NAME: "noreply"
1312
PDS_MODERATION_EMAIL_FROM_ADDRESS: "noreply@blacksky.app"
1413
PDS_HOSTNAME: "localho.st"
1514
PDS_SERVICE_DID: "did:web:localho.st"
16-
17-
# Secrets (make sure these are defined in your repository's Secrets settings)
1815
PDS_ADMIN_PASS: ${{ secrets.PDS_ADMIN_PASS }}
1916
PDS_JWT_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_JWT_KEY_K256_PRIVATE_KEY_HEX }}
2017
PDS_MAILGUN_API_KEY: ${{ secrets.PDS_MAILGUN_API_KEY }}
@@ -26,77 +23,52 @@ jobs:
2623
check:
2724
runs-on: ubuntu-latest
2825
steps:
29-
- name: Checkout code
30-
uses: actions/checkout@v4
31-
32-
- name: Set up nightly-2025-01-03
33-
uses: actions-rs/toolchain@v1
34-
with:
35-
toolchain: nightly-2025-01-03
36-
override: true
37-
components: rustfmt, clippy
38-
39-
- name: Rust Cache
40-
uses: Swatinem/rust-cache@v2
41-
42-
- name: Run cargo check
43-
run: cargo check
26+
- name: Checkout code
27+
uses: actions/checkout@v4
28+
- name: Rust Cache
29+
uses: Swatinem/rust-cache@v2
30+
- name: Run cargo check
31+
run: cargo check
4432

4533
build:
4634
runs-on: ubuntu-latest
4735
steps:
48-
- name: Checkout code
49-
uses: actions/checkout@v4
50-
51-
- name: Set up nightly-2025-01-03
52-
uses: actions-rs/toolchain@v1
53-
with:
54-
toolchain: nightly-2025-01-03
55-
override: true
56-
components: rustfmt, clippy
57-
58-
- name: Rust Cache
59-
uses: Swatinem/rust-cache@v2
60-
61-
- name: Run cargo build
62-
run: cargo build --release
36+
- name: Checkout code
37+
uses: actions/checkout@v4
38+
- name: Rust Cache
39+
uses: Swatinem/rust-cache@v2
40+
- name: Run cargo build
41+
run: cargo build --release
6342

6443
test:
6544
runs-on: ubuntu-latest
6645
needs: build
6746
steps:
68-
- name: Checkout code
69-
uses: actions/checkout@v4
70-
71-
- name: Set up nightly-2025-01-03
72-
uses: actions-rs/toolchain@v1
73-
with:
74-
toolchain: nightly-2025-01-03
75-
override: true
76-
components: rustfmt, clippy
77-
78-
- name: Rust Cache
79-
uses: Swatinem/rust-cache@v2
80-
81-
- name: Run cargo test
82-
run: cargo test
47+
- name: Checkout code
48+
uses: actions/checkout@v4
49+
- name: Rust Cache
50+
uses: Swatinem/rust-cache@v2
51+
- name: Run cargo test
52+
run: cargo test
53+
54+
# clippy:
55+
# runs-on: ubuntu-latest
56+
# needs: test
57+
# steps:
58+
# - name: Checkout code
59+
# uses: actions/checkout@v4
60+
# - name: Rust Cache
61+
# uses: Swatinem/rust-cache@v2
62+
# - name: Run Clippy
63+
# run: cargo clippy -- -D warnings
8364

8465
formatting:
8566
runs-on: ubuntu-latest
8667
needs: test
8768
steps:
88-
- name: Checkout code
89-
uses: actions/checkout@v4
90-
91-
- name: Set up nightly-2025-01-03
92-
uses: actions-rs/toolchain@v1
93-
with:
94-
toolchain: nightly-2025-01-03
95-
override: true
96-
components: rustfmt, clippy
97-
98-
- name: Rust Cache
99-
uses: Swatinem/rust-cache@v2
100-
101-
- name: Run cargo fmt
102-
run: cargo fmt -- --check
69+
- name: Checkout code
70+
uses: actions/checkout@v4
71+
- name: Rust Cache
72+
uses: Swatinem/rust-cache@v2
73+
- name: Run cargo fmt
74+
run: cargo fmt -- --check

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ libipld = "0.16.0"
1212
serde_cbor = "0.11.2"
1313
serde_bytes = "0.11.15"
1414
tokio = { version = "1.28.2",features = ["full"] }
15-
sha2 = "0.11.0-pre.3"
15+
sha2 = "0.10.8"
1616
rand = "0.8.5"
1717
rand_core = "0.6.4"
1818
secp256k1 = { version = "0.28.2", features = ["global-context", "serde", "rand", "hashes","rand-std"] }

0 commit comments

Comments
 (0)