Skip to content

Commit 8a2fcd8

Browse files
committed
Split the runners into to steps that don't depend on each other
1 parent 6b9c32b commit 8a2fcd8

File tree

1 file changed

+14
-34
lines changed

1 file changed

+14
-34
lines changed

.github/workflows/run-integration-test.yml

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
prepare-deps:
17-
runs-on: buildjet-2vcpu-ubuntu-2204
17+
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4
2020
name: 'Checkout rascal (${{ inputs.rascal_version }})'
@@ -48,9 +48,8 @@ jobs:
4848
path: deps/
4949
retention-days: 1
5050

51-
52-
rascal:
53-
runs-on: buildjet-4vcpu-ubuntu-2204
51+
rascal-and-libs:
52+
runs-on: buildjet-2vcpu-ubuntu-2204
5453
needs: prepare-deps
5554
steps:
5655
- uses: actions/checkout@v4
@@ -63,36 +62,23 @@ jobs:
6362
with:
6463
name: deps
6564

66-
- name: Typecheck rascal
65+
- name: Typecheck rascal and libraries
6766
env:
6867
JAVA_TOOL_OPTIONS: "-Djava.io.tmpdir=${{ runner.temp }}"
6968
run: |
7069
java -Xmx500m -jar rascal/rascal.jar Main \
7170
--libs "${{ inputs.dependencies_on_lib_path }}" \
72-
--memory 14G \
71+
--maxCores 2
72+
--memory 6G \
7373
--rascalVersion "|cwd:///rascal/rascal.jar|" \
7474
--repoFolder "|cwd:///repos|" \
7575
--full false \
7676
--clean \
77-
--tests rascal
78-
79-
- uses: actions/upload-artifact@v4
80-
name: Store rascal tpls
81-
with:
82-
name: rascal-tpls
83-
path: repos
84-
retention-days: 1
85-
if-no-files-found: error
77+
--tests "'rascal' 'flybytes' 'salix-core' 'salix-contrib' 'drambiguity' 'rascal-lsp' 'rascal-git' 'php-analysis' 'typepal'"
8678
87-
other-projects:
79+
full-compiler-tests:
8880
runs-on: buildjet-4vcpu-ubuntu-2204
89-
strategy:
90-
matrix:
91-
target:
92-
- "'flybytes' 'salix-core' 'salix-contrib' 'drambiguity' 'rascal-lsp' 'rascal-git' 'php-analysis' 'typepal'"
93-
- "'rascal-all' 'rascal-lsp-all'"
94-
fail-fast: false
95-
needs: [rascal, prepare-deps]
81+
needs: prepare-deps
9682
steps:
9783
- uses: actions/checkout@v4
9884
- uses: actions/setup-java@v4
@@ -104,22 +90,16 @@ jobs:
10490
with:
10591
name: deps
10692

107-
- uses: actions/download-artifact@v4
108-
with:
109-
name: rascal-tpls
110-
path: repos
111-
112-
- run: tree repos/
113-
114-
- name: Typecheck rascal-libs (deps on libs=${{ inputs.dependencies_on_lib_path }})
93+
- name: Typecheck rascal-compiler and rascal-lsp rename code
11594
env:
11695
JAVA_TOOL_OPTIONS: "-Djava.io.tmpdir=${{ runner.temp }}"
11796
run: |
118-
java -Xmx1G -jar rascal/rascal.jar Main \
97+
java -Xmx500m -jar rascal/rascal.jar Main \
11998
--libs "${{ inputs.dependencies_on_lib_path }}" \
120-
--memory 13G \
99+
--maxCores 4
100+
--memory 14G \
121101
--rascalVersion "|cwd:///rascal/rascal.jar|" \
122102
--repoFolder "|cwd:///repos|" \
123103
--full false \
124104
--clean \
125-
--tests ${{ matrix.target }}
105+
--tests "'rascal-all' 'rascal-lsp-all'"

0 commit comments

Comments
 (0)