GitLab CI: Switch to Alpine Docker images where possible

partially reverts cdeec7cfb
This commit is contained in:
YoshiRulz 2022-10-27 15:36:57 +10:00
parent 256a8617e9
commit 02d1542e40
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 6 additions and 6 deletions

View File

@ -15,7 +15,7 @@ stages:
before_script:
- nix-env -iA nixpkgs.cachix
- cachix use $CACHIX_CACHE_NAME
image: nixos/nix:2.11.1
image: nixos/nix:latest
variables:
CACHIX_CACHE_NAME: mono-for-bizhawk
@ -127,13 +127,13 @@ check_style:
name: "$CI_HAWK_ARTIFACT_NAME"
paths:
- "$CI_HAWK_ARTIFACT_NAME_TAR"
image: nixos/nix:2.11.1
image: alpine:latest
needs:
- build_asms_release
- job: build_asms_debug
artifacts: false
script:
- nix-shell -p stdenvNoCC --run 'Dist/Package.sh "linux-x64"'
- Dist/Package.sh 'linux-x64'
- cd packaged_output
- tar -cf "../$CI_HAWK_ARTIFACT_NAME_TAR" *
stage: package
@ -144,13 +144,13 @@ check_style:
name: "$CI_HAWK_ARTIFACT_NAME"
paths:
- ./*
image: nixos/nix:2.11.1
image: alpine:latest
needs:
- build_asms_release
- job: build_asms_debug
artifacts: false
script:
- nix-shell -p stdenvNoCC --run 'Dist/Package.sh "windows-x64"'
- Dist/Package.sh 'windows-x64'
# now we replace $CI_PROJECT_DIR with $CI_PROJECT_DIR/packaged_output, so that the archival step will put everything at the top level
- mv packaged_output ..
- cd ..

View File

@ -2,7 +2,7 @@
set -e
cd "$(dirname "$0")/.."
rm -fr "packaged_output" && mkdir -p "packaged_output"
find "output" -type f \( -wholename "output/EmuHawk.exe" -o -wholename "output/DiscoHawk.exe" -o -wholename "output/*.config" -o -wholename "output/defctrl.json" -o -wholename "output/EmuHawkMono.sh" -o -wholename "output/dll/*" -o -wholename "output/Shaders/*" -o -wholename "output/gamedb/*" -o -wholename "output/Tools/*" -o -wholename "output/NES/Palettes/*" -o -wholename "output/Lua/*" -o -wholename "output/Gameboy/Palettes/*" \) -not -name "*.pdb" -not -name "*.lib" -not -name "*.pgd" -not -name "*.ipdb" -not -name "*.iobj" -not -name "*.exp" -not -wholename "output/dll/libsneshawk-64*.exe" -not -name "*.ilk" -not -wholename "output/dll/gpgx.elf" -not -wholename "output/dll/miniclient.*" -exec install -D -m644 -T "{}" "packaged_{}" \;
find "output" -type f \( -wholename "output/EmuHawk.exe" -o -wholename "output/DiscoHawk.exe" -o -wholename "output/*.config" -o -wholename "output/defctrl.json" -o -wholename "output/EmuHawkMono.sh" -o -wholename "output/dll/*" -o -wholename "output/Shaders/*" -o -wholename "output/gamedb/*" -o -wholename "output/Tools/*" -o -wholename "output/NES/Palettes/*" -o -wholename "output/Lua/*" -o -wholename "output/Gameboy/Palettes/*" \) -not -name "*.pdb" -not -name "*.lib" -not -name "*.pgd" -not -name "*.ipdb" -not -name "*.iobj" -not -name "*.exp" -not -wholename "output/dll/libsneshawk-64*.exe" -not -name "*.ilk" -not -wholename "output/dll/gpgx.elf" -not -wholename "output/dll/miniclient.*" -exec install -D -m644 "{}" "packaged_{}" \;
if [ "$1" = "windows-x64" ]; then rm "packaged_output/EmuHawkMono.sh"; fi
find "packaged_output/dll" -type f -name "*.xml" -exec rm "{}" \;
mkdir "packaged_output/Firmware"