Skip to content

Commit 7ba5a74

Browse files
committed
Potential fix
Another CI run Remove comment Concurrency test Concurrency test 2 concurrency test 3 Test test 2 Attempt fix Add more jobs to the new runner Use container Remove a small diff Another diff fix Enable cancel in progress
1 parent fa624f9 commit 7ba5a74

1 file changed

Lines changed: 31 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ jobs:
2828
runs-on: ${{ matrix.runner }}
2929

3030
# Add container only for Linux runner
31-
container: ${{ matrix.use_container && fromJSON('{"image":"localhost:5000/spacetimedb-ci:latest","options":"--privileged -v /opt/github-runner/cargo-cache:/home/runner/.cargo/registry -v /opt/github-runner/cargo-git:/home/runner/.cargo/git"}') || null }}
31+
container: ${{ matrix.use_container && fromJSON('{
32+
"image": "localhost:5000/spacetimedb-ci:latest",
33+
"options": "--privileged"
34+
}') || null }}
3235

3336
steps:
3437
- name: Find Git ref
@@ -48,9 +51,7 @@ jobs:
4851
with:
4952
ref: ${{ env.GIT_REF }}
5053
- uses: dsherret/rust-toolchain-file@v1
51-
# Only install .NET on Windows (not in container where it's pre-installed)
5254
- uses: actions/setup-dotnet@v4
53-
if: ${{ !matrix.use_container }}
5455
with:
5556
global-json-file: global.json
5657

@@ -99,15 +100,11 @@ jobs:
99100
test:
100101
name: Test Suite
101102
runs-on: spacetimedb-new-runner
102-
103-
# Add this for isolation:
104103
container:
105104
image: localhost:5000/spacetimedb-ci:latest
106105
options: >-
107106
--privileged
108107
-v /var/run/docker.sock:/var/run/docker.sock
109-
-v /opt/github-runner/cargo-cache:/home/runner/.cargo/registry
110-
-v /opt/github-runner/cargo-git:/home/runner/.cargo/git
111108
steps:
112109
- name: Find Git ref
113110
env:
@@ -126,11 +123,12 @@ jobs:
126123
with:
127124
ref: ${{ env.GIT_REF }}
128125

129-
- name: Verify .NET
130-
run: dotnet --version
131-
132126
- uses: dsherret/rust-toolchain-file@v1
133127

128+
- uses: actions/setup-dotnet@v3
129+
with:
130+
global-json-file: global.json
131+
134132
- name: Set up Node.js
135133
uses: actions/setup-node@v4
136134
with:
@@ -140,6 +138,11 @@ jobs:
140138
with:
141139
run_install: true
142140

141+
- name: Create /stdb dir
142+
run: |
143+
sudo mkdir /stdb
144+
sudo chmod 777 /stdb
145+
143146
- name: Build typescript module sdk
144147
working-directory: crates/bindings-typescript
145148
run: pnpm build
@@ -165,7 +168,12 @@ jobs:
165168

166169
lints:
167170
name: Lints
168-
runs-on: spacetimedb-runner
171+
runs-on: spacetimedb-new-runner
172+
container:
173+
image: localhost:5000/spacetimedb-ci:latest
174+
options: >-
175+
--privileged
176+
-v /var/run/docker.sock:/var/run/docker.sock
169177
steps:
170178
- name: Checkout sources
171179
uses: actions/checkout@v3
@@ -204,7 +212,12 @@ jobs:
204212
205213
wasm_bindings:
206214
name: Build and test wasm bindings
207-
runs-on: spacetimedb-runner
215+
runs-on: spacetimedb-new-runner
216+
container:
217+
image: localhost:5000/spacetimedb-ci:latest
218+
options: >-
219+
--privileged
220+
-v /var/run/docker.sock:/var/run/docker.sock
208221
steps:
209222
- uses: actions/checkout@v3
210223

@@ -229,7 +242,12 @@ jobs:
229242

230243
publish_checks:
231244
name: Check that packages are publishable
232-
runs-on: ubuntu-latest
245+
runs-on: spacetimedb-new-runner
246+
container:
247+
image: localhost:5000/spacetimedb-ci:latest
248+
options: >-
249+
--privileged
250+
-v /var/run/docker.sock:/var/run/docker.sock
233251
permissions: read-all
234252
steps:
235253
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)