From 02d1542e40a3d9456d2a753bd2d2e159c0e0e7b3 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 27 Oct 2022 15:36:57 +1000
Subject: [PATCH] GitLab CI: Switch to Alpine Docker images where possible

partially reverts cdeec7cfb
---
 .gitlab-ci.yml  | 10 +++++-----
 Dist/Package.sh |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32ba8c8256..a3387039dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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 ..
diff --git a/Dist/Package.sh b/Dist/Package.sh
index 0d5f22a268..5a1342b7f2 100755
--- a/Dist/Package.sh
+++ b/Dist/Package.sh
@@ -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"