alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

use docker instead of podman (#659)

Browse source 
Use docker instead of podman for github actions build
This commit is contained in:
Corwin 2024-04-29 02:08:38 +01:00 committed by GitHub
parent 4f84c0767f 384c2a6ae8
commit 3d0de3535e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/build-site.yml vendored
View file

@ -12,7 +12,6 @@ jobs:
name: Build website name: Build website
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: gacts/install-podman@v1
- name: Set CARGO_TARGET_DIR - name: Set CARGO_TARGET_DIR
run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV
- name: Install build tools - name: Install build tools
@ -36,7 +35,7 @@ jobs:
- name: Setup wasm - name: Setup wasm
run: just setup-cargo-wasm run: just setup-cargo-wasm
- name: Build website - name: Build website
run: just build-site run: just podman_command=docker build-site
- name: Upload artifact - name: Upload artifact
uses: actions/upload-pages-artifact@v3 uses: actions/upload-pages-artifact@v3
with: with:

4
justfile
View file

@ -1,6 +1,8 @@
export CARGO_TARGET_DIR := env_var_or_default('CARGO_TARGET_DIR', justfile_directory() + "/target") export CARGO_TARGET_DIR := env_var_or_default('CARGO_TARGET_DIR', justfile_directory() + "/target")
CLIPPY_ARGUMENTS := "-Dwarnings -Dclippy::all -Aclippy::empty-loop" CLIPPY_ARGUMENTS := "-Dwarnings -Dclippy::all -Aclippy::empty-loop"
podman_command := "podman"
build: build-roms build: build-roms
build-debug: build-debug:
@ -103,7 +105,7 @@ build-website-backtrace:
build-mgba-wasm: build-mgba-wasm:
rm -rf website/agb/src/app/mgba/vendor rm -rf website/agb/src/app/mgba/vendor
mkdir 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: build-combo-rom-site:
just _build-rom "examples/combo" "AGBGAMES" just _build-rom "examples/combo" "AGBGAMES"