From 6e8d4ad0243addfea4f0d41691934fc3575eb53d Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Thu, 4 Jan 2024 19:03:21 +0100
Subject: [PATCH] fix: update ci #13
---
.gitlab-ci.yml | 13 +++++++------
devenv.lock | 8 ++++----
devenv.nix | 13 +++++++------
project.nix | 2 +-
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e19dcb..ec72f87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,15 @@
## DO NOT EDIT THIS FILE MANUALLY, IT IS GENERATED BY NIX
image: docker-registry.schukai.com:443/nixos-ci-devenv:latest
- services:
- - docker:dind
+ #services:
+ # - docker:dind
variables:
NIXOS_VERSION: "23.11"
NIXPKGS_ALLOW_UNFREE: "1"
NIXPKGS_ALLOW_INSECURE: "1"
- DOCKER_DRIVER: overlay2
+ #DOCKER_DRIVER: overlay2
stages:
@@ -27,17 +27,18 @@
rules:
- if: '$CI_COMMIT_TAG'
when: never
- - if: '$CI_COMMIT_MESSAGE =~ /RELEASE_IT/'
+ - if: '$CI_COMMIT_TAG_MESSAGE =~ /DO_RELEASE/'
+ when: never
+ - if: '$CI_COMMIT_MESSAGE =~ /Bump version/'
when: never
- when: on_success
-
release:
tags:
- nixos
stage: release
rules:
- - if: '$CI_COMMIT_MESSAGE =~ /RELEASE_IT/'
+ - if: 'CI_COMMIT_TAG_MESSAGE =~ /DO_RELEASE/ && $CI_COMMIT_TAG'
when: on_success
- when: never
variables:
diff --git a/devenv.lock b/devenv.lock
index 6272f22..b0e1ca4 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -171,11 +171,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1704386783,
- "narHash": "sha256-3A1Qk+6xEEMdRoxUQ4SwsXfRF9xBEPaDz2zULB8yivk=",
+ "lastModified": 1704388615,
+ "narHash": "sha256-A7e/1zC35y18ZeKfkM/KE51YZOl4lZlgyxWX1hn+PKg=",
"ref": "refs/heads/master",
- "rev": "b59fa00d04de1b11d50fb4807f7b079590707dd6",
- "revCount": 93,
+ "rev": "3b9618b684a2ccb5df5bda72ef3e14a4c1a20e81",
+ "revCount": 99,
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
},
diff --git a/devenv.nix b/devenv.nix
index fddf722..a446170 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -119,15 +119,15 @@ tasks:
## DO NOT EDIT THIS FILE MANUALLY, IT IS GENERATED BY NIX
image: docker-registry.schukai.com:443/nixos-ci-devenv:latest
- services:
- - docker:dind
+ #services:
+ # - docker:dind
variables:
NIXOS_VERSION: "23.11"
NIXPKGS_ALLOW_UNFREE: "1"
NIXPKGS_ALLOW_INSECURE: "1"
- DOCKER_DRIVER: overlay2
+ #DOCKER_DRIVER: overlay2
stages:
@@ -145,17 +145,18 @@ tasks:
rules:
- if: '$CI_COMMIT_TAG'
when: never
- - if: '$CI_COMMIT_MESSAGE =~ /RELEASE_IT/'
+ - if: '$CI_COMMIT_TAG_MESSAGE =~ /DO_RELEASE/'
+ when: never
+ - if: '$CI_COMMIT_MESSAGE =~ /Bump version/'
when: never
- when: on_success
-
release:
tags:
- nixos
stage: release
rules:
- - if: '$CI_COMMIT_MESSAGE =~ /RELEASE_IT/'
+ - if: 'CI_COMMIT_TAG_MESSAGE =~ /DO_RELEASE/ && $CI_COMMIT_TAG'
when: on_success
- when: never
variables:
diff --git a/project.nix b/project.nix
index 5bdab38..76a4dfc 100644
--- a/project.nix
+++ b/project.nix
@@ -5,6 +5,6 @@
supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
compileForSystems = ["linux/arm64" "linux/amd64" "darwin/amd64" "windows/amd64"];
modulePath = "gitlab.schukai.com/oss/utilities/version";
- version="0.7.3"; ## don't change this line, it is updated automatically by GitLab CI
+ version = "0.7.3"; ## don't change this line, it is updated automatically by GitLab CI
vendorHash = "sha256-uyWI6Gnko1J62XDk6jjRdqZ8TSFtwsTOlDwdR9Xc+ic="; ## this is updated automatically by update-hashes
}
--
GitLab