Skip to content

Commit fe20451

Browse files
ci: Disable workspace hack crate before testing feature combinations
1 parent 7dba6fa commit fe20451

File tree

2 files changed

+26
-58
lines changed

2 files changed

+26
-58
lines changed

.github/ci_generator/templates/job_steps/pavex_tests.jinja

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@
1717
uses: actions/setup-go@v6
1818
with:
1919
go-version: "1.25.0"
20-
<% include 'setup_pavex' %>
20+
- name: Install cargo-hakari
21+
uses: taiki-e/install-action@v2
22+
with:
23+
tool: cargo-hakari
24+
- name: Remove workspace hack from Cargo.toml
25+
run: |
26+
cargo hakari disable
27+
cargo hakari remove-deps -y
2128
- name: Run Pavex tests with multiple feature combinations
2229
if: runner.os != 'Windows'
2330
run: |

.github/workflows/docs.yml

Lines changed: 18 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -791,29 +791,14 @@ jobs:
791791
uses: actions/setup-go@v6
792792
with:
793793
go-version: "1.25.0"
794-
- name: Download pavex CLI artifact
795-
uses: actions/download-artifact@v4
796-
with:
797-
name: pavex_cli_linux
798-
path: ~/.cargo/bin
799-
- name: Download pavexc CLI artifact
800-
uses: actions/download-artifact@v4
794+
- name: Install cargo-hakari
795+
uses: taiki-e/install-action@v2
801796
with:
802-
name: pavexc_cli_linux
803-
path: ~/.cargo/bin
804-
- name: Mark pavex as executable
805-
env:
806-
PAVEX: /home/runner/.cargo/bin/pavex
807-
PAVEXC: /home/runner/.cargo/bin/pavexc
797+
tool: cargo-hakari
798+
- name: Remove workspace hack from Cargo.toml
808799
run: |
809-
chmod +x ${{ env.PAVEX }}
810-
chmod +x ${{ env.PAVEXC }}
811-
- name: Activate pavex
812-
env:
813-
PAVEX_ACTIVATION_KEY: ${{ secrets.pavex_activation_key }}
814-
run: |
815-
pavex self activate
816-
pavexc self setup
800+
cargo hakari disable
801+
cargo hakari remove-deps -y
817802
- name: Run Pavex tests with multiple feature combinations
818803
if: runner.os != 'Windows'
819804
run: |
@@ -1119,29 +1104,14 @@ jobs:
11191104
uses: actions/setup-go@v6
11201105
with:
11211106
go-version: "1.25.0"
1122-
- name: Download pavex CLI artifact
1123-
uses: actions/download-artifact@v4
1107+
- name: Install cargo-hakari
1108+
uses: taiki-e/install-action@v2
11241109
with:
1125-
name: pavex_cli_macos
1126-
path: ~/.cargo/bin
1127-
- name: Download pavexc CLI artifact
1128-
uses: actions/download-artifact@v4
1129-
with:
1130-
name: pavexc_cli_macos
1131-
path: ~/.cargo/bin
1132-
- name: Mark pavex as executable
1133-
env:
1134-
PAVEX: /Users/runner/.cargo/bin/pavex
1135-
PAVEXC: /Users/runner/.cargo/bin/pavexc
1136-
run: |
1137-
chmod +x ${{ env.PAVEX }}
1138-
chmod +x ${{ env.PAVEXC }}
1139-
- name: Activate pavex
1140-
env:
1141-
PAVEX_ACTIVATION_KEY: ${{ secrets.pavex_activation_key }}
1110+
tool: cargo-hakari
1111+
- name: Remove workspace hack from Cargo.toml
11421112
run: |
1143-
pavex self activate
1144-
pavexc self setup
1113+
cargo hakari disable
1114+
cargo hakari remove-deps -y
11451115
- name: Run Pavex tests with multiple feature combinations
11461116
if: runner.os != 'Windows'
11471117
run: |
@@ -1441,23 +1411,14 @@ jobs:
14411411
uses: actions/setup-go@v6
14421412
with:
14431413
go-version: "1.25.0"
1444-
- name: Download pavex CLI artifact
1445-
uses: actions/download-artifact@v4
1414+
- name: Install cargo-hakari
1415+
uses: taiki-e/install-action@v2
14461416
with:
1447-
name: pavex_cli_windows
1448-
path: ~/.cargo/bin
1449-
- name: Download pavexc CLI artifact
1450-
uses: actions/download-artifact@v4
1451-
with:
1452-
name: pavexc_cli_windows
1453-
path: ~/.cargo/bin
1454-
1455-
- name: Activate pavex
1456-
env:
1457-
PAVEX_ACTIVATION_KEY: ${{ secrets.pavex_activation_key }}
1417+
tool: cargo-hakari
1418+
- name: Remove workspace hack from Cargo.toml
14581419
run: |
1459-
pavex self activate
1460-
pavexc self setup
1420+
cargo hakari disable
1421+
cargo hakari remove-deps -y
14611422
- name: Run Pavex tests with multiple feature combinations
14621423
if: runner.os != 'Windows'
14631424
run: |

0 commit comments

Comments
 (0)