From 6316cab017a5901dedc8d9ce10b093c4dd3def96 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 12 Dec 2021 18:40:51 +1000 Subject: [PATCH] Replace Debian image w/ Nix (Alpine) in GitLab CI --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f9040ea2d..134a47011e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,14 +117,13 @@ check_style: name: "$CI_HAWK_ARTIFACT_NAME" paths: - "$CI_HAWK_ARTIFACT_NAME_TAR" - image: debian:buster-slim + image: nixos/nix:latest needs: - build_asms_release - job: build_asms_debug artifacts: false script: - - su -c "apt-get update && apt-get -y install p7zip-full" - - Dist/Package.sh "linux-x64" + - nix-shell -p stdenvNoCC --run 'Dist/Package.sh "linux-x64"' - cd packaged_output - tar -cf "../$CI_HAWK_ARTIFACT_NAME_TAR" * stage: package @@ -135,14 +134,13 @@ check_style: name: "$CI_HAWK_ARTIFACT_NAME" paths: - ./* - image: debian:buster-slim + image: nixos/nix:latest needs: - build_asms_release - job: build_asms_debug artifacts: false script: - - su -c "apt-get update && apt-get -y install p7zip-full" - - Dist/Package.sh "windows-x64" + - nix-shell -p stdenvNoCC --run '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 ..