From 2abf8be63801ad89b347709e1ce4705e76f0f367 Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Mon, 14 Aug 2023 14:16:33 +0200 Subject: [PATCH] chore: ci --- .gitlab-ci.yaml | 6 +++--- devenv.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml index e88d621..4ddf72a 100644 --- a/.gitlab-ci.yaml +++ b/.gitlab-ci.yaml @@ -28,12 +28,12 @@ before_script: after_script: - if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi -build: +test: stage: build tags: - nixos script: - - devenv shell build-app + - devenv shell test-lib cache: - key: nixos @@ -49,7 +49,7 @@ deploy: tags: - nixos script: - - devenv shell -c deploy-app + - devenv shell -c deploy-lib when: on_success diff --git a/devenv.nix b/devenv.nix index cef457e..d8692f7 100644 --- a/devenv.nix +++ b/devenv.nix @@ -47,7 +47,7 @@ # This script is executed when the app is built # You can use it to build the app - scripts.build-app.exec = '' + scripts.test-lib.exec = '' #!${pkgs.bash}/bin/bash #set -euo pipefail set -x @@ -76,7 +76,7 @@ task test # This scritp is used to deploy the app to the gitlab registry # It is used by the gitlab-ci.yml file # The environment variables are set in the gitlab project settings - scripts.deploy-app.exec = '' + scripts.deploy-lib.exec = '' #!${pkgs.bash}/bin/bash PATH="''${PATH}":${pkgs.coreutils}/bin @@ -149,7 +149,7 @@ fi git --no-pager log --decorate=short --pretty=oneline gitVersion=v$(version predict) - +git tag -a $gitVersion git push -o ci.skip origin ''${CI_COMMIT_REF_NAME} --tags -- GitLab