Skip to content

Commit d977856

Browse files
committed
remove Delete huge unnecessary tools folder
1 parent aaa9e86 commit d977856

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

.github/npm_test_integration.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -euo pipefail
23
OUR_NIX=$(readlink -f $(which nix))
34
OUR_NIX_PARENT=$(dirname $OUR_NIX)
45
TEE=$(which tee)

.github/workflows/test.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
- name: Run tests
8282
run: |
8383
export THYMIS_FLAKE_ROOT='..'
84-
../.github/npm_test_integration.sh
84+
nix develop .#ci --command ../.github/npm_test_integration.sh
8585
working-directory: frontend
8686
- uses: actions/upload-artifact@v4
8787
id: artifact-upload
@@ -169,7 +169,7 @@ jobs:
169169
- name: Run tests
170170
run: |
171171
# export THYMIS_FLAKE_ROOT='..' # stable input needs THYMIS_FLAKE_ROOT to be unset
172-
../.github/npm_test_integration.sh
172+
nix develop .#ci --command ../.github/npm_test_integration.sh
173173
working-directory: frontend
174174
- uses: actions/upload-artifact@v4
175175
id: artifact-upload
@@ -193,10 +193,6 @@ jobs:
193193
needs: changes
194194
if: ${{ ! (needs.changes.outputs.package-lock-json == 'true' && github.actor == 'renovate[bot]' && github.event_name == 'pull_request') }}
195195
steps:
196-
- name: Delete huge unnecessary tools folder
197-
run: |
198-
cd /opt
199-
find . -maxdepth 1 -mindepth 1 '!' -path ./containerd '!' -path ./actionarchivecache '!' -path ./runner '!' -path ./runner-cache -exec rm -rf '{}' ';'
200196
- uses: actions/checkout@v4
201197
- uses: ./.github/actions/setup-nix
202198
with:
@@ -216,7 +212,7 @@ jobs:
216212
- name: Run tests
217213
run: |
218214
export THYMIS_FLAKE_ROOT='..'
219-
../.github/npm_test_integration.sh -- tests/x86_vm.spec.ts
215+
nix develop .#ci --command ../.github/npm_test_integration.sh -- tests/x86_vm.spec.ts
220216
working-directory: frontend
221217
- uses: actions/upload-artifact@v4
222218
id: artifact-upload
@@ -240,10 +236,6 @@ jobs:
240236
needs: changes
241237
if: ${{ ! (needs.changes.outputs.package-lock-json == 'true' && github.actor == 'renovate[bot]' && github.event_name == 'pull_request') }}
242238
steps:
243-
- name: Delete huge unnecessary tools folder
244-
run: |
245-
cd /opt
246-
find . -maxdepth 1 -mindepth 1 '!' -path ./containerd '!' -path ./actionarchivecache '!' -path ./runner '!' -path ./runner-cache -exec rm -rf '{}' ';'
247239
- uses: actions/checkout@v4
248240
- uses: ./.github/actions/setup-nix
249241
with:
@@ -263,7 +255,7 @@ jobs:
263255
- name: Run tests
264256
run: |
265257
# export THYMIS_FLAKE_ROOT='..' # stable input needs THYMIS_FLAKE_ROOT to be unset
266-
../.github/npm_test_integration.sh -- tests/x86_vm.spec.ts
258+
nix develop .#ci --command ../.github/npm_test_integration.sh -- tests/x86_vm.spec.ts
267259
working-directory: frontend
268260
- uses: actions/upload-artifact@v4
269261
id: artifact-upload
@@ -286,9 +278,6 @@ jobs:
286278
runs-on: [self-hosted, Linux, X64]
287279
steps:
288280
- uses: actions/checkout@v4
289-
- name: Install pre-commit
290-
run: |
291-
nix develop .#ci --command python -m pip install pre-commit
292281
- name: Install node dependencies
293282
run: |
294283
nix develop .#ci --command npm ci

flake.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@
155155
pkgs.python313
156156
pkgs.nodejs_22
157157
pkgs.nixpkgs-fmt
158+
pkgs.pre-commit
159+
pkgs.which
160+
pkgs.curl
158161
];
159162
};
160163
forNpmTesting = pkgs.mkShell {

0 commit comments

Comments
 (0)