Skip to content

Commit 0a08879

Browse files
authored
CI - cargo ci update-flow runs on Windows (#4874)
# Description of Changes Removed some "if we're on windows" checks in the CI so that we're always running through `cargo ci update-flow`. # API and ABI breaking changes None. CI only. # Expected complexity level and risk 1. # Testing - [x] Upgrade flow tests pass Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com>
1 parent 943ed7c commit 0a08879

2 files changed

Lines changed: 6 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -389,28 +389,10 @@ jobs:
389389
shell: bash
390390
run: sudo apt install -y libssl-dev
391391

392-
- name: Build spacetimedb-update
393-
run: cargo build --features github-token-auth --target ${{ matrix.target }} -p spacetimedb-update
394-
if: runner.os == 'Windows'
395-
396-
- name: Run self-install
397-
env:
398-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
399-
shell: bash
400-
run: |
401-
ROOT_DIR="$(mktemp -d)"
402-
# NOTE(bfops): We need the `github-token-auth` feature because we otherwise tend to get ratelimited when we try to fetch `/releases/latest`.
403-
# My best guess is that, on the GitHub runners, the "anonymous" ratelimit is shared by *all* users of that runner (I think this because it
404-
# happens very frequently on the `macos-runner`, but we haven't seen it on any others).
405-
cargo run --features github-token-auth --target ${{ matrix.target }} -p spacetimedb-update -- self-install --root-dir="${ROOT_DIR}" --yes
406-
"${ROOT_DIR}"/spacetime --root-dir="${ROOT_DIR}" help
407-
if: runner.os == 'Windows'
408-
409392
- name: Test spacetimedb-update
410393
env:
411394
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
412395
run: cargo ci update-flow --target=${{ matrix.target }} --github-token-auth
413-
if: runner.os != 'Windows'
414396

415397
unreal_engine_tests:
416398
name: Unreal Engine Tests

tools/ci/src/main.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,12 @@ fn main() -> Result<()> {
587587
.chain(["--", "self-install", &root_arg, "--yes"].into_iter()),
588588
)
589589
.run()?;
590-
cmd!(format!("{}/spacetime", root_dir_string), &root_arg, "help",).run()?;
590+
591+
let mut spacetime_path = root_dir.path().join("spacetime");
592+
if !std::env::consts::EXE_EXTENSION.is_empty() {
593+
spacetime_path.set_extension(std::env::consts::EXE_EXTENSION);
594+
}
595+
cmd(spacetime_path, [&root_arg, "help"]).run()?;
591596
}
592597

593598
Some(CiCmd::CliDocs { spacetime_path }) => {

0 commit comments

Comments
 (0)