Skip to content

Commit 042a1b7

Browse files
fix: remove explicit setting of rust toolchain in ci
1 parent fae774b commit 042a1b7

File tree

4 files changed

+37
-45
lines changed

4 files changed

+37
-45
lines changed

.github/workflows/publish-python.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ jobs:
3030
- name: "Configure Git safe directory"
3131
run: git config --global --add safe.directory /__w/bdk-python/bdk-python
3232

33-
- name: "Install Rust 1.84.1"
34-
uses: actions-rs/toolchain@v1
35-
with:
36-
toolchain: 1.84.1
37-
33+
- name: "Set up Rust"
34+
uses: actions-rust-lang/setup-rust-toolchain@v1
35+
3836
- name: "Generate bdk.py and binaries"
3937
run: bash ./scripts/generate-linux.sh
4038

@@ -74,6 +72,9 @@ jobs:
7472
with:
7573
python-version: ${{ matrix.python }}
7674

75+
- name: "Set up Rust"
76+
uses: actions-rust-lang/setup-rust-toolchain@v1
77+
7778
- name: "Generate bdk.py and binaries"
7879
run: bash ./scripts/generate-macos-arm64.sh
7980

@@ -114,6 +115,9 @@ jobs:
114115
with:
115116
python-version: ${{ matrix.python }}
116117

118+
- name: "Set up Rust"
119+
uses: actions-rust-lang/setup-rust-toolchain@v1
120+
117121
- name: "Generate bdk.py and binaries"
118122
run: bash ./scripts/generate-macos-x86_64.sh
119123

@@ -152,6 +156,9 @@ jobs:
152156
with:
153157
python-version: ${{ matrix.python }}
154158

159+
- name: "Set up Rust"
160+
uses: actions-rust-lang/setup-rust-toolchain@v1
161+
155162
- name: "Generate bdk.py and binaries"
156163
run: bash ./scripts/generate-windows.sh
157164

.github/workflows/python-api-docs.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@ jobs:
1919

2020
- name: "Configure Git safe directory"
2121
run: git config --global --add safe.directory /__w/bdk-python/bdk-python
22-
23-
- name: "Install Rust 1.84.1"
24-
uses: actions-rs/toolchain@v1
25-
with:
26-
toolchain: 1.84.1
2722

2823
- name: Set up Python
2924
uses: actions/setup-python@v5
3025
with:
3126
python-version: "3.12"
3227

28+
- name: "Set up Rust"
29+
uses: actions-rust-lang/setup-rust-toolchain@v1
30+
3331
- name: "Generate bdk.py"
3432
env:
3533
PYBIN: ${{ env.pythonLocation }}/bin

.github/workflows/test-bdk-ffi-latest.yaml

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
- name: "Configure Git safe directory"
3535
run: git config --global --add safe.directory /__w/bdk-python/bdk-python
3636

37+
- name: "Set up Rust"
38+
uses: actions-rust-lang/setup-rust-toolchain@v1
39+
3740
- name: "Update bdk-ffi submodule to latest"
3841
run: |
3942
cd ./bdk-ffi/ \
@@ -50,11 +53,6 @@ jobs:
5053
~/.cargo/git
5154
./target
5255
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
53-
54-
- name: "Setup Rust"
55-
uses: actions-rust-lang/setup-rust-toolchain@v1.15.0
56-
with:
57-
toolchain: 1.85.1
5856

5957
- name: "Generate bdk.py and binaries"
6058
run: bash ./scripts/generate-linux.sh
@@ -97,14 +95,8 @@ jobs:
9795
&& git pull origin master \
9896
&& echo "Testing commit: $(git log -1 --pretty=format:'%h %s (author: %cn)')"
9997
100-
- name: "Cache"
101-
uses: actions/cache@v3
102-
with:
103-
path: |
104-
~/.cargo/registry
105-
~/.cargo/git
106-
./target
107-
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
98+
- name: "Set up Rust"
99+
uses: actions-rust-lang/setup-rust-toolchain@v1
108100

109101
- name: "Install Python"
110102
uses: actions/setup-python@v4
@@ -154,14 +146,8 @@ jobs:
154146
&& git pull origin master \
155147
&& echo "Testing commit: $(git log -1 --pretty=format:'%h %s (author: %cn)')"
156148
157-
- name: "Cache"
158-
uses: actions/cache@v3
159-
with:
160-
path: |
161-
~/.cargo/registry
162-
~/.cargo/git
163-
./target
164-
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
149+
- name: "Set up Rust"
150+
uses: actions-rust-lang/setup-rust-toolchain@v1
165151

166152
- uses: actions/setup-python@v4
167153
with:
@@ -208,14 +194,8 @@ jobs:
208194
git pull origin master;
209195
echo "Testing commit: $(git log -1 --pretty=format:'%h %s (author: %cn)')"
210196
211-
- name: "Cache"
212-
uses: actions/cache@v3
213-
with:
214-
path: |
215-
~/.cargo/registry
216-
~/.cargo/git
217-
./target
218-
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
197+
- name: "Set up Rust"
198+
uses: actions-rust-lang/setup-rust-toolchain@v1
219199

220200
- name: "Install Python"
221201
uses: actions/setup-python@v4

.github/workflows/test-python.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ jobs:
3131

3232
- name: "Configure Git safe directory"
3333
run: git config --global --add safe.directory /__w/bdk-python/bdk-python
34-
35-
- name: "Install Rust 1.84.1"
36-
uses: actions-rs/toolchain@v1
37-
with:
38-
toolchain: 1.84.1
3934

35+
- name: "Set up Rust"
36+
uses: actions-rust-lang/setup-rust-toolchain@v1
37+
4038
- name: "Generate bdk.py and binaries"
4139
run: bash ./scripts/generate-linux.sh
4240

@@ -80,7 +78,10 @@ jobs:
8078
uses: actions/setup-python@v4
8179
with:
8280
python-version: ${{ matrix.python }}
83-
81+
82+
- name: "Set up Rust"
83+
uses: actions-rust-lang/setup-rust-toolchain@v1
84+
8485
- name: "Generate bdk.py and binaries"
8586
run: bash ./scripts/generate-macos-arm64.sh
8687

@@ -126,6 +127,9 @@ jobs:
126127
with:
127128
python-version: ${{ matrix.python }}
128129

130+
- name: "Set up Rust"
131+
uses: actions-rust-lang/setup-rust-toolchain@v1
132+
129133
- name: "Generate bdk.py and binaries"
130134
run: bash ./scripts/generate-macos-x86_64.sh
131135

@@ -170,6 +174,9 @@ jobs:
170174
with:
171175
python-version: ${{ matrix.python }}
172176

177+
- name: "Set up Rust"
178+
uses: actions-rust-lang/setup-rust-toolchain@v1
179+
173180
- name: "Generate bdk.py and binaries"
174181
run: bash ./scripts/generate-windows.sh
175182

0 commit comments

Comments
 (0)