From 1a3e63786ccc49f5562b762f486d7f178e786dac Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 12 May 2024 23:49:44 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 20 ++++++++++----------
flake.lock | 4 ++--
flake.nix | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 455e8e7b5..a0dcfb0fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,14 +26,14 @@ test:
script:
- nix develop .#gitlab --command run-ci-tests
-deploy:
- stage: deploy
- tags:
- - nixos-gen3
- script:
- - nix develop --command deploy
- after_script:
- - nix develop --command clean-up
-
- when: on_success
+#deploy:
+# stage: deploy
+# tags:
+# - nixos-gen3
+# script:
+# - nix develop --command deploy
+# after_script:
+# - nix develop --command clean-up
+#
+# when: on_success
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 127ebc463..1affddb71 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
"rev": "4a30b23f6580958ff5e06af5534f03228f7be631",
"revCount": 28,
"type": "git",
- "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git"
+ "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git/"
},
"original": {
"type": "git",
- "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git"
+ "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git/"
}
},
"flake-utils": {
diff --git a/flake.nix b/flake.nix
index c0f3e6cc7..2a1735636 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
nixpkgs = {url = "github:nixos/nixpkgs/nixos-23.11";};
flake-utils = {url = "github:numtide/flake-utils";};
version = {url = "git+https://gitlab.schukai.com/oss/utilities/version.git/";};
- devFlakes = {url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git";};
+ devFlakes = {url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git/";};
};
outputs = {
@@ -35,8 +35,8 @@
rootPath = ./.;
- commonPck = devFlakes.packages.${system}.common;
- commonScript = commonPck + "/bin/common";
+ # commonPck = devFlakes.packages.${system}.common;
+ commonScript = "/bin/common";
commonPackages = import ./nix/config/common-packages.nix {inherit pkgs';};
--
GitLab