diff --git a/.github/workflows/attach-artifacts.yml b/.github/workflows/attach-artifacts.yml index d79ef4bcc53..a448c706ba9 100644 --- a/.github/workflows/attach-artifacts.yml +++ b/.github/workflows/attach-artifacts.yml @@ -9,11 +9,7 @@ on: jobs: upload-assets: - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: ubuntu-latest permissions: contents: write # needed to modify releases diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f01eefbe04f..d7dc0029060 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,13 +23,10 @@ jobs: name: Smoketests strategy: matrix: - runner: [spacetimedb-new-runner, windows-latest] + runner: [spacetimedb-new-runner-2, windows-latest] include: - - runner: spacetimedb-new-runner + - runner: spacetimedb-new-runner-2 smoketest_args: --docker - container: - image: localhost:5000/spacetimedb-ci:latest - options: --privileged - runner: windows-latest smoketest_args: --no-build-cli container: null @@ -86,10 +83,6 @@ jobs: shell: powershell - name: Build crates run: cargo build -p spacetimedb-cli -p spacetimedb-standalone -p spacetimedb-update - - name: Start Docker daemon - if: runner.os == 'Linux' - run: /usr/local/bin/start-docker.sh - - name: Build and start database (Linux) if: runner.os == 'Linux' run: | @@ -123,11 +116,13 @@ jobs: test: needs: [lints, llm_ci_check] name: Test Suite + # TODO: Migrate to spacetimedb-new-runner2 when flakes are fixed runs-on: spacetimedb-new-runner container: image: localhost:5000/spacetimedb-ci:latest options: >- --privileged + env: CARGO_TARGET_DIR: ${{ github.workspace }}/target steps: @@ -180,11 +175,7 @@ jobs: lints: name: Lints - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: spacetimedb-new-runner-2 env: CARGO_TARGET_DIR: ${{ github.workspace }}/target steps: @@ -212,11 +203,7 @@ jobs: wasm_bindings: name: Build and test wasm bindings - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: spacetimedb-new-runner-2 env: CARGO_TARGET_DIR: ${{ github.workspace }}/target steps: @@ -239,11 +226,7 @@ jobs: publish_checks: name: Check that packages are publishable - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: ubuntu-latest permissions: read-all steps: - uses: actions/checkout@v3 @@ -272,11 +255,8 @@ jobs: strategy: matrix: include: - - runner: spacetimedb-new-runner + - runner: spacetimedb-new-runner-2 target: x86_64-unknown-linux-gnu - container: - image: localhost:5000/spacetimedb-ci:latest - options: --privileged - { target: aarch64-unknown-linux-gnu, runner: arm-runner } - { target: aarch64-apple-darwin, runner: macos-latest } - { target: x86_64-pc-windows-msvc, runner: windows-latest } @@ -324,7 +304,7 @@ jobs: name: Unreal Engine Tests # This can't go on e.g. ubuntu-latest because that runner runs out of disk space. ChatGPT suggested that the general solution tends to be to use # a custom runner. - runs-on: spacetimedb-new-runner + runs-on: spacetimedb-new-runner-2 # Disable the tests because they are very flaky at the moment. # TODO: Remove this line and re-enable the `if` line just below here. if: false @@ -439,11 +419,7 @@ jobs: cli_docs: name: Check CLI docs permissions: read-all - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: spacetimedb-new-runner-2 env: CARGO_TARGET_DIR: ${{ github.workspace }}/target steps: @@ -524,12 +500,7 @@ jobs: permissions: contents: read checks: write - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged - --cgroupns=host + runs-on: spacetimedb-unity-runner timeout-minutes: 30 env: CARGO_TARGET_DIR: ${{ github.workspace }}/target @@ -630,9 +601,6 @@ jobs: key: Unity-${{ github.head_ref }} restore-keys: Unity- - # We need this to support "Docker in Docker" - - name: Start Docker daemon - run: /usr/local/bin/start-docker.sh - name: Run Unity tests uses: game-ci/unity-test-runner@v4 with: @@ -649,12 +617,7 @@ jobs: csharp-testsuite: needs: [lints, llm_ci_check] - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged - --cgroupns=host + runs-on: spacetimedb-new-runner-2 timeout-minutes: 30 env: CARGO_TARGET_DIR: ${{ github.workspace }}/target diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c603fa598d6..25a06ec36e4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ on: jobs: docker-amd64: - runs-on: ubuntu-latest + runs-on: spacetimedb-new-runner-2 name: Build DockerHub AMD64 Container steps: - name: Checkout diff --git a/.github/workflows/docs-publish.yaml b/.github/workflows/docs-publish.yaml index 0f27c09f919..4b068d00bc3 100644 --- a/.github/workflows/docs-publish.yaml +++ b/.github/workflows/docs-publish.yaml @@ -10,11 +10,7 @@ on: jobs: build: - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: spacetimedb-new-runner-2 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/docs-test.yaml b/.github/workflows/docs-test.yaml index 111ca49f62a..b7233aad847 100644 --- a/.github/workflows/docs-test.yaml +++ b/.github/workflows/docs-test.yaml @@ -7,11 +7,7 @@ on: jobs: build: - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runs-on: spacetimedb-new-runner-2 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e9ccf1d8bec..11c0aeafdeb 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -16,11 +16,7 @@ jobs: include: - name: x86_64 Linux target: x86_64-unknown-linux-gnu - runner: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: >- - --privileged + runner: spacetimedb-new-runner-2 - { name: aarch64 Linux, target: aarch64-unknown-linux-gnu, runner: arm-runner } # Disabled because musl builds weren't working and we didn't want to investigate. See https://github.com/clockworklabs/SpacetimeDB/pull/2964. # - { name: x86_64 Linux musl, target: x86_64-unknown-linux-musl, runner: bare-metal, container: alpine } diff --git a/.github/workflows/typescript-lint.yml b/.github/workflows/typescript-lint.yml index fee7aa442a0..8eca0cac19b 100644 --- a/.github/workflows/typescript-lint.yml +++ b/.github/workflows/typescript-lint.yml @@ -9,12 +9,7 @@ on: jobs: build: - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: --privileged - - + runs-on: spacetimedb-new-runner-2 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/typescript-test.yml b/.github/workflows/typescript-test.yml index 9affa726f47..3017f70ff5b 100644 --- a/.github/workflows/typescript-test.yml +++ b/.github/workflows/typescript-test.yml @@ -13,10 +13,7 @@ concurrency: jobs: build-and-test: - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: --privileged + runs-on: spacetimedb-new-runner-2 env: CARGO_TARGET_DIR: ${{ github.workspace }}/target diff --git a/.github/workflows/upgrade-version-check.yml b/.github/workflows/upgrade-version-check.yml index 41f8f178573..6b97d825a38 100644 --- a/.github/workflows/upgrade-version-check.yml +++ b/.github/workflows/upgrade-version-check.yml @@ -8,10 +8,7 @@ permissions: read-all jobs: version_upgrade_check: - runs-on: spacetimedb-new-runner - container: - image: localhost:5000/spacetimedb-ci:latest - options: --privileged + runs-on: spacetimedb-new-runner-2 steps: - name: Checkout uses: actions/checkout@v3