Skip to content

Commit 63ea793

Browse files
committed
fix: artifact download and rust cache
1 parent 7ff5f6c commit 63ea793

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

.github/actions/artifact/download/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ runs:
1919
steps:
2020
- name: Download artifact from github
2121
uses: actions/download-artifact@v4.1.7
22-
if: ${{ runner.environment == 'github-hosted' || inputs.force-use-github == 'true' }}
22+
if: ${{ runner.environment == 'github-hosted' || startsWith(runner.name, 'blacksmith-') || inputs.force-use-github == 'true' }}
2323
with:
2424
name: ${{ inputs.name }}
2525
path: ${{ inputs.path }}
2626
- name: Download artifact from local
27-
if: ${{ runner.environment == 'self-hosted' && inputs.force-use-github != 'true' }}
27+
if: ${{ runner.environment == 'self-hosted' && startsWith(runner.name, 'rspack') && inputs.force-use-github != 'true' }}
2828
uses: lynx-infra/download-artifact@79d9914484f933089c2840552cf439bac85debad # https://github.com/lynx-infra/download-artifact/tree/dev
2929
with:
3030
name: ${{ inputs.name }}

.github/actions/cache/restore/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
steps:
2424
- name: Restore cache to github
2525
id: github-cache
26-
if: ${{ runner.environment == 'github-hosted' }}
26+
if: ${{ runner.environment == 'github-hosted' || startsWith(runner.name, 'blacksmith-') }}
2727
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
2828
with:
2929
key: ${{ inputs.key }}

.github/actions/cache/save/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
using: composite
1515
steps:
1616
- name: Save cache to github
17-
if: ${{ runner.environment == 'github-hosted' }}
17+
if: ${{ runner.environment == 'github-hosted' || startsWith(runner.name, 'blacksmith-') }}
1818
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
1919
with:
2020
key: ${{ inputs.key }}

.github/actions/rustup/cargo/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323

2424
- name: Cache to local
2525
uses: rstackjs/rust-cache@8269079380bc35105b3ed8b0f1f7c9557c6dec93 # v2.7.8
26-
if: ${{ runner.environment == 'self-hosted' }}
26+
if: ${{ runner.environment == 'self-hosted' && startsWith(runner.name, 'rspack') }}
2727
with:
2828
prefix-key: 'RCache-L-5'
2929
shared-key: ${{ inputs.key }}

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ permissions:
3333

3434
jobs:
3535
check-changed:
36-
runs-on: blacksmith-4vcpu-ubuntu-2404
36+
runs-on: blacksmith-4vcpu-ubuntu-2204
3737
name: Check Source Changed
3838
outputs:
3939
code_changed: ${{ steps.filter.outputs.code_changed == 'true' }}
@@ -59,7 +59,7 @@ jobs:
5959
uses: ./.github/workflows/reusable-build.yml
6060
with:
6161
target: x86_64-unknown-linux-gnu
62-
runner: ${{ '"blacksmith-4vcpu-ubuntu-2404"' }}
62+
runner: ${{ '"blacksmith-4vcpu-ubuntu-2204"' }}
6363
test: true
6464
bench: true
6565
prefer_docker: false
@@ -72,8 +72,8 @@ jobs:
7272
with:
7373
target: x86_64-pc-windows-msvc
7474
profile: 'dev'
75-
runner: ${{ vars.WINDOWS_SELF_HOSTED_RUNNER_LABELS || '"windows-latest"' }}
76-
test-runner: '"windows-latest"'
75+
runner: ${{ '"blacksmith-4vcpu-windows-2025"' }}
76+
test-runner: '"blacksmith-4vcpu-windows-2025"'
7777
test: true
7878

7979
test-mac:
@@ -96,13 +96,13 @@ jobs:
9696
with:
9797
target: wasm32-wasip1-threads
9898
profile: 'ci'
99-
runner: ${{ vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"' }}
99+
runner: ${{ '"blacksmith-4vcpu-ubuntu-2204"' }}
100100
test: true
101101

102102
check-codspeed:
103103
name: Check Bench Result
104104
needs: [test-linux]
105-
runs-on: blacksmith-4vcpu-ubuntu-2404
105+
runs-on: blacksmith-4vcpu-ubuntu-2204
106106
env:
107107
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108108
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
@@ -163,7 +163,7 @@ jobs:
163163
check-cache,
164164
]
165165
if: ${{ always() && !cancelled() }}
166-
runs-on: blacksmith-4vcpu-ubuntu-2404
166+
runs-on: blacksmith-4vcpu-ubuntu-2204
167167
steps:
168168
- name: Log
169169
run: echo ${{ join(needs.*.result, ',') }}

.github/workflows/release-canary.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ jobs:
4747
matrix:
4848
array:
4949
- target: x86_64-unknown-linux-gnu
50-
runner: ${{'"blacksmith-4vcpu-ubuntu-2404"'}}
50+
runner: ${{'"blacksmith-4vcpu-ubuntu-2204"'}}
5151
- target: aarch64-unknown-linux-gnu
52-
runner: ${{'"blacksmith-4vcpu-ubuntu-2404"'}}
52+
runner: ${{'"blacksmith-4vcpu-ubuntu-2204"'}}
5353
- target: x86_64-unknown-linux-musl
54-
runner: ${{'"blacksmith-4vcpu-ubuntu-2404"'}}
54+
runner: ${{'"blacksmith-4vcpu-ubuntu-2204"'}}
5555
- target: aarch64-unknown-linux-musl
56-
runner: ${{'"blacksmith-4vcpu-ubuntu-2404"'}}
56+
runner: ${{'"blacksmith-4vcpu-ubuntu-2204"'}}
5757
- target: i686-pc-windows-msvc
5858
runner: ${{ needs.get-runner-labels.outputs.WINDOWS_RUNNER_LABELS }}
5959
- target: x86_64-pc-windows-msvc
@@ -65,7 +65,7 @@ jobs:
6565
- target: aarch64-apple-darwin
6666
runner: ${{ needs.get-runner-labels.outputs.MACOS_RUNNER_LABELS }}
6767
- target: wasm32-wasip1-threads
68-
runner: ${{'"blacksmith-4vcpu-ubuntu-2404"'}}
68+
runner: ${{'"blacksmith-4vcpu-ubuntu-2204"'}}
6969
uses: ./.github/workflows/reusable-build.yml
7070
with:
7171
ref: ${{inputs.commit || github.sha}}
@@ -76,7 +76,7 @@ jobs:
7676

7777
release:
7878
name: Release Canary
79-
runs-on: blacksmith-4vcpu-ubuntu-2404
79+
runs-on: blacksmith-4vcpu-ubuntu-2204
8080
needs: build
8181
environment: npm-canary
8282
steps:

.github/workflows/reusable-build-codspeed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
codspeed:
1717
name: Codspeed-build
18-
runs-on: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"' ) }}
18+
runs-on: ${{ fromJSON(inputs.runner) }}
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5

.github/workflows/size-limit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
size-limit:
1212
name: Binding Size Limit
13-
runs-on: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"') }}
13+
runs-on: blacksmith-4vcpu-ubuntu-2204
1414
steps:
1515
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
1616

0 commit comments

Comments
 (0)