diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e19dcb0a9f96cdbd8604aafda81222b65391012..ec72f872b8676e433b668d79d157d72060ba9708 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 6272f2270df48698f0eaf39e4bf3bd912309448e..b0e1ca4295fa91429b1d22f264a6398a0729e8c1 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 fddf7229e640b6363023ee5badb7e241e54d9d55..a44617047bef404b2f7d854403d1661882598919 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 5bdab3807046562bbd882fcdf5e0761fd4d504b4..76a4dfc44c8fed083be53fa347571f91dfe3378a 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 }