Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Monster
Manage
Activity
Members
Plan
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Libraries
Javascript
Monster
Commits
417829c3
Verified
Commit
417829c3
authored
10 months ago
by
Volker Schukai
Browse files
Options
Downloads
Patches
Plain Diff
fix: wip new pipeline
parent
0b5f794e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+32
-32
32 additions, 32 deletions
.gitlab-ci.yml
nix/scripts/release.nix
+2
-2
2 additions, 2 deletions
nix/scripts/release.nix
with
34 additions
and
34 deletions
.gitlab-ci.yml
+
32
−
32
View file @
417829c3
...
...
@@ -20,38 +20,38 @@ before_script:
after_script
:
-
nix develop .#gitlab --command clean-up
tests
:
stage
:
test
tags
:
-
nixos-gen3
script
:
-
nix develop .#gitlab --command run-ci-tests
cache
:
untracked
:
true
key
:
files
:
-
pnpm-lock.yaml
paths
:
-
node_modules/
web-tests
:
stage
:
test
tags
:
-
nixos-gen3
script
:
-
nix develop .#gitlab --command run-ci-web-tests
cache
:
untracked
:
true
key
:
files
:
-
pnpm-lock.yaml
paths
:
-
node_modules/
artifacts
:
paths
:
-
screenshot.png
rules
:
-
if
:
'
$CI_COMMIT_TAG
==
null'
#
tests:
#
stage: test
#
tags:
#
- nixos-gen3
#
script:
#
- nix develop .#gitlab --command run-ci-tests
#
cache:
#
untracked: true
#
key:
#
files:
#
- pnpm-lock.yaml
#
paths:
#
- node_modules/
#
#
web-tests:
#
stage: test
#
tags:
#
- nixos-gen3
#
script:
#
- nix develop .#gitlab --command run-ci-web-tests
#
cache:
#
untracked: true
#
key:
#
files:
#
- pnpm-lock.yaml
#
paths:
#
- node_modules/
#
artifacts:
#
paths:
#
- screenshot.png
#
rules:
#
- if: '$CI_COMMIT_TAG == null'
release
:
stage
:
release
...
...
This diff is collapsed.
Click to expand it.
nix/scripts/release.nix
+
2
−
2
View file @
417829c3
...
...
@@ -34,7 +34,7 @@ in
${
pkgs
'
.
git
}
/bin/git checkout $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
3
0
if !
${
pkgs
'
.
git
}
/bin/git --no-pager log --decorate=short --pretty=oneline -n
1
0
then
echo_fail "Error: Could not get git log."
exit 1
...
...
@@ -51,7 +51,7 @@ in
fi
echo_step "Write project version"
set -x
export VERSION=$gitVersion
export COMMIT="$CI_COMMIT_SHA"
export NAME=$(basename $(pwd) | sed 's/./\U&/' | sed 's/-//g')
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment