From d936bde07352858788ab73e45563f97910c86a22 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sat, 28 Sep 2024 17:25:17 +0200
Subject: [PATCH] chore: change gitlab-ci script
---
.gitlab-ci.yml | 60 ++++++++++++++++++--------------------------------
1 file changed, 22 insertions(+), 38 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bc73eb..78b9b3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,59 +1,43 @@
-
-# THIS FILE IS AUTOGENERATED BY THE DEVENVSHELL
-# DO NOT EDIT THIS FILE MANUALLY
-# INSTEAD EDIT THE DEVENVSHELL CONFIGURATION FILE devenv.nix
-# AND OPEN A SHELL WITH THE COMMAND devenv shell
-#
-
-image: docker-registry.schukai.com:443/nixos-ci-devenv:latest
-
variables:
- # The repo name as used in
- # https://github.com/nix-community/NUR/blob/master/repos.json
- NIXOS_VERSION: "23.05"
NIXPKGS_ALLOW_UNFREE: "1"
NIXPKGS_ALLOW_INSECURE: "1"
GIT_DEPTH: 10
+ GIT_SUBMODULE_STRATEGY: normal
+ GIT_SUBMODULE_DEPTH: 1
+
stages:
- test
- - deploy
+ - release
before_script:
- - echo > .env-gitlab-ci
- - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
- - cat .env-gitlab-ci
+ - git config --global user.email "${GITLAB_USER_EMAIL}"
+ - git config --global user.name "${GITLAB_USER_NAME:-"Gitlab CI"}"
+ - git config --global credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=${CI_JOB_TOKEN}"; }; f'
+ - git config --global pull.rebase true
+ - git config --global http.sslVerify "false"
+
after_script:
- - if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi
+ - nix develop .#gitlab --command clean-up
-test:
+tests:
stage: test
tags:
- - nixos
+ - nixos-gen3
script:
- - devenv shell test-lib
-
- cache:
- - key: nixos
- paths:
- - /nix/store
-
+ - nix develop .#gitlab --command run-ci-tests
artifacts:
paths:
- - dist
+ - last-phpunit-result.xml
-deploy:
- stage: deploy
+release:
+ stage: release
tags:
- - nixos
+ - nixos-gen3
script:
- - devenv shell -c deploy-lib
-
+ - nix develop .#gitlab --command release
when: on_success
-
- cache:
- - key: nixos
- paths:
- - /nix/store
-
+ rules:
+ - if: $CI_COMMIT_BRANCH == "master"
+
\ No newline at end of file
--
GitLab