Skip to content
Snippets Groups Projects
Verified Commit 417829c3 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix: wip new pipeline

parent 0b5f794e
No related branches found
No related tags found
No related merge requests found
...@@ -20,38 +20,38 @@ before_script: ...@@ -20,38 +20,38 @@ before_script:
after_script: after_script:
- nix develop .#gitlab --command clean-up - nix develop .#gitlab --command clean-up
tests: #tests:
stage: test # stage: test
tags: # tags:
- nixos-gen3 # - nixos-gen3
script: # script:
- nix develop .#gitlab --command run-ci-tests # - nix develop .#gitlab --command run-ci-tests
cache: # cache:
untracked: true # untracked: true
key: # key:
files: # files:
- pnpm-lock.yaml # - pnpm-lock.yaml
paths: # paths:
- node_modules/ # - node_modules/
#
web-tests: #web-tests:
stage: test # stage: test
tags: # tags:
- nixos-gen3 # - nixos-gen3
script: # script:
- nix develop .#gitlab --command run-ci-web-tests # - nix develop .#gitlab --command run-ci-web-tests
cache: # cache:
untracked: true # untracked: true
key: # key:
files: # files:
- pnpm-lock.yaml # - pnpm-lock.yaml
paths: # paths:
- node_modules/ # - node_modules/
artifacts: # artifacts:
paths: # paths:
- screenshot.png # - screenshot.png
rules: # rules:
- if: '$CI_COMMIT_TAG == null' # - if: '$CI_COMMIT_TAG == null'
release: release:
stage: release stage: release
......
...@@ -34,7 +34,7 @@ in ...@@ -34,7 +34,7 @@ in
${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME ${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME
${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME ${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME
if ! ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 30 if ! ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 10
then then
echo_fail "Error: Could not get git log." echo_fail "Error: Could not get git log."
exit 1 exit 1
...@@ -51,7 +51,7 @@ in ...@@ -51,7 +51,7 @@ in
fi fi
echo_step "Write project version" echo_step "Write project version"
set -x
export VERSION=$gitVersion export VERSION=$gitVersion
export COMMIT="$CI_COMMIT_SHA" export COMMIT="$CI_COMMIT_SHA"
export NAME=$(basename $(pwd) | sed 's/./\U&/' | sed 's/-//g') export NAME=$(basename $(pwd) | sed 's/./\U&/' | sed 's/-//g')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment