From 23ae3788f6aa6bd92ff7d06acc167147b0c9f986 Mon Sep 17 00:00:00 2001 From: Corwin Date: Mon, 29 Apr 2024 01:57:32 +0100 Subject: [PATCH] use docker instead of podman --- .github/workflows/build-site.yml | 3 +-- justfile | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index 7d2b0495..3092c5ec 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -12,7 +12,6 @@ jobs: name: Build website runs-on: ubuntu-22.04 steps: - - uses: gacts/install-podman@v1 - name: Set CARGO_TARGET_DIR run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV - name: Install build tools @@ -36,7 +35,7 @@ jobs: - name: Setup wasm run: just setup-cargo-wasm - name: Build website - run: just build-site + run: just build-site podman_command=docker - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: diff --git a/justfile b/justfile index 365514cf..e64dfb26 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,8 @@ export CARGO_TARGET_DIR := env_var_or_default('CARGO_TARGET_DIR', justfile_directory() + "/target") CLIPPY_ARGUMENTS := "-Dwarnings -Dclippy::all -Aclippy::empty-loop" +podman_command := "podman" + build: build-roms build-debug: @@ -103,7 +105,7 @@ build-website-backtrace: build-mgba-wasm: rm -rf website/agb/src/app/mgba/vendor mkdir website/agb/src/app/mgba/vendor - podman build --file website/mgba-wasm/BuildMgbaWasm --output=website/agb/src/app/mgba/vendor . + {{podman_command}} build --file website/mgba-wasm/BuildMgbaWasm --output=website/agb/src/app/mgba/vendor . build-combo-rom-site: just _build-rom "examples/combo" "AGBGAMES"