Skip to content

Commit fa624f9

Browse files
committed
Rerun CI
Updated Runner fix Don't install dotnet in the container for smoketests Rerun Use container settings Rerun again Try again Yet another run Dont use runner user Try again Test ephemeral runners
1 parent ac437f8 commit fa624f9

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ jobs:
2323
strategy:
2424
matrix:
2525
include:
26-
- { runner: spacetimedb-new-runner, smoketest_args: --docker }
27-
- { runner: windows-latest, smoketest_args: --no-build-cli }
26+
- { runner: spacetimedb-new-runner, smoketest_args: --docker, use_container: true }
27+
- { runner: windows-latest, smoketest_args: --no-build-cli, use_container: false }
2828
runs-on: ${{ matrix.runner }}
2929

3030
# Add container only for Linux runner
31-
container: ${{ matrix.runner == 'spacetimedb-new-runner' && 'localhost:5000/spacetimedb-ci:latest' || '' }}
32-
runs-on: ${{ matrix.runner }}
33-
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 }}
32+
3433
steps:
3534
- name: Find Git ref
3635
env:
@@ -49,7 +48,9 @@ jobs:
4948
with:
5049
ref: ${{ env.GIT_REF }}
5150
- uses: dsherret/rust-toolchain-file@v1
51+
# Only install .NET on Windows (not in container where it's pre-installed)
5252
- uses: actions/setup-dotnet@v4
53+
if: ${{ !matrix.use_container }}
5354
with:
5455
global-json-file: global.json
5556

@@ -103,7 +104,6 @@ jobs:
103104
container:
104105
image: localhost:5000/spacetimedb-ci:latest
105106
options: >-
106-
--user runner
107107
--privileged
108108
-v /var/run/docker.sock:/var/run/docker.sock
109109
-v /opt/github-runner/cargo-cache:/home/runner/.cargo/registry

0 commit comments

Comments
 (0)