Skip to content

Commit

Permalink
p7zip is no longer a hard dependency for make archive.
Browse files Browse the repository at this point in the history
  • Loading branch information
AliceLR committed Nov 19, 2024
1 parent fdfec5c commit 15481f9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
19 changes: 2 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Regression tests
env:
MZXDEPS_DEBIAN_SDL2: "zlib1g-dev libpng-dev libogg-dev libvorbis-dev libsdl2-dev"
MZXDEPS_DEBIAN_MISC: "libsdl1.2-dev libegl1-mesa-dev libmikmod-dev libopenmpt-dev"
MZXDEPS_DEBIAN_CROSS: "p7zip-full"
MZXDEPS_MACOS: "libpng libogg libvorbis sdl2"
MZX_MAKE: "make -j4"

Expand Down Expand Up @@ -143,7 +142,7 @@ jobs:
msystem: MINGW64
update: true
install: >-
base-devel git p7zip
base-devel git
mingw-w64-x86_64-gcc mingw-w64-x86_64-zlib mingw-w64-x86_64-libpng
mingw-w64-x86_64-libogg mingw-w64-x86_64-libvorbis mingw-w64-x86_64-SDL2
- uses: actions/checkout@v4
Expand All @@ -168,7 +167,7 @@ jobs:
msystem: MINGW32
update: true
install: >-
base-devel git p7zip
base-devel git
mingw-w64-i686-gcc mingw-w64-i686-zlib mingw-w64-i686-libpng
mingw-w64-i686-libogg mingw-w64-i686-libvorbis mingw-w64-i686-SDL2
- uses: actions/checkout@v4
Expand All @@ -185,8 +184,6 @@ jobs:
runs-on: ubuntu-latest
container: devkitpro/devkita64
steps:
- name: Install dependencies
run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- run: echo "PATH=$DEVKITPRO/devkitA64/bin:$PATH" >> $GITHUB_ENV
- uses: actions/checkout@v4
- name: Configure Switch
Expand All @@ -200,8 +197,6 @@ jobs:
runs-on: ubuntu-latest
container: devkitpro/devkitarm
steps:
- name: Install dependencies
run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- run: echo "PATH=$DEVKITPRO/devkitARM/bin:$PATH" >> $GITHUB_ENV
- uses: actions/checkout@v4
- name: Configure 3DS
Expand All @@ -215,8 +210,6 @@ jobs:
runs-on: ubuntu-latest
container: devkitpro/devkitarm
steps:
- name: Install dependencies
run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- run: echo "PATH=$DEVKITPRO/devkitARM/bin:$PATH" >> $GITHUB_ENV
- uses: actions/checkout@v4
- name: Configure NDS
Expand All @@ -230,8 +223,6 @@ jobs:
runs-on: ubuntu-latest
container: skylyrac/blocksds:slim-latest
steps:
- name: Install dependencies
run: apt update && apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- name: Install target dependencies
run: wf-pacman -Syu --noconfirm && wf-pacman -S --noconfirm toolchain-gcc-arm-none-eabi-zlib
- run: echo "BLOCKSDS=/opt/blocksds/core" >> $GITHUB_ENV
Expand All @@ -247,8 +238,6 @@ jobs:
runs-on: ubuntu-latest
container: devkitpro/devkitppc
steps:
- name: Install dependencies
run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- run: echo "PATH=$DEVKITPRO/devkitPPC/bin:$PATH" >> $GITHUB_ENV
- uses: actions/checkout@v4
- name: Configure Wii
Expand All @@ -262,8 +251,6 @@ jobs:
runs-on: ubuntu-latest
container: devkitpro/devkitppc
steps:
- name: Install dependencies
run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- run: echo "PATH=$DEVKITPRO/devkitPPC/bin:$PATH" >> $GITHUB_ENV
- uses: actions/checkout@v4
- name: Configure Wii U
Expand All @@ -276,8 +263,6 @@ jobs:
Emscripten-HTML5:
runs-on: ubuntu-latest
steps:
- name: Install dependencies
run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_CROSS
- name: Install Emscripten
uses: mymindstorm/setup-emsdk@v14
with:
Expand Down
6 changes: 5 additions & 1 deletion arch/zip.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ archive: build
${RM} -r build/dist/${SUBPLATFORM}
${MKDIR} -p build/dist/${SUBPLATFORM}
@cd build/${SUBPLATFORM} && \
7za a -tzip ../dist/${SUBPLATFORM}/${TARGET}-${SUBARCH}.zip *
if command -v 7za >/dev/null 2>/dev/null; then \
7za a -mx9 -tzip "../dist/${SUBPLATFORM}/${TARGET}-${SUBARCH}.zip" *; \
else \
zip -r9 "../dist/${SUBPLATFORM}/${TARGET}-${SUBARCH}.zip" *; \
fi

0 comments on commit 15481f9

Please sign in to comment.