From 947b443a463ed3568ceb76ecba8d504996cacac2 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Thu, 20 Jun 2024 18:31:43 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 3 +--
flake.nix | 4 ++--
nix/scripts/{build-and-publish.nix => deploy.nix} | 4 ++--
nix/scripts/go-task.nix | 6 +++---
4 files changed, 8 insertions(+), 9 deletions(-)
rename nix/scripts/{build-and-publish.nix => deploy.nix} (88%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a67753c5f..ff3298531 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ tests:
tags:
- nixos-gen3
script:
- - printenv
- nix develop .#gitlab --command run-ci-tests
cache:
untracked: true
@@ -71,7 +70,7 @@ deploy:
tags:
- nixos-gen3
script:
- - nix develop .#gitlab --command build-and-publish
+ - nix develop .#gitlab --command deploy
when: on_success
rules:
- if: $DEPLOY_VERSION && $CI_COMMIT_TAG
diff --git a/flake.nix b/flake.nix
index dce67da01..adf178b41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,7 +125,7 @@
scriptRunCITests = pkgs'.callPackage ./nix/scripts/run-ci-tests.nix {inherit pkgs';};
scriptRunCIWebTests = pkgs'.callPackage ./nix/scripts/run-ci-web-tests.nix {inherit pkgs';};
scriptRelease = pkgs'.callPackage ./nix/scripts/release.nix {inherit pkgs';};
- scriptBuildAndPublish = pkgs'.callPackage ./nix/scripts/build-and-publish.nix {inherit pkgs' system self;};
+ scriptDeploy = pkgs'.callPackage ./nix/scripts/deploy.nix {inherit pkgs' system self;};
commonPackages = import ./nix/config/common-packages.nix {inherit pkgs';};
@@ -134,7 +134,7 @@
scriptRunCITests
scriptRunCIWebTests
scriptRelease
- scriptBuildAndPublish
+ scriptDeploy
];
scriptPackages = [
diff --git a/nix/scripts/build-and-publish.nix b/nix/scripts/deploy.nix
similarity index 88%
rename from nix/scripts/build-and-publish.nix
rename to nix/scripts/deploy.nix
index e16391987..6bb6bd73f 100644
--- a/nix/scripts/build-and-publish.nix
+++ b/nix/scripts/deploy.nix
@@ -8,7 +8,7 @@ self,
releaseInfo = import ../config/release.nix;
monster = pkgs'.callPackage ../packages/monster.nix {inherit pkgs' system self;};
in
- pkgs'.writeShellScriptBin "build-and-publish" ''
+ pkgs'.writeShellScriptBin "deploy" ''
source ${pkgs'.common}/bin/common
${bashFktScript}
@@ -16,7 +16,7 @@ in
archive=$(ls ${monster} | grep tgz)
## npm instead of pnpm because of https://github.com/pnpm/pnpm/issues/7950
- if ! publishingResult=$(${pkgs'.nodejs_20}/bin/npm publish "${monster}/$archive" --json --dry-run --no-git-checks --access public)
+ if ! publishingResult=$(${pkgs'.nodejs_20}/bin/npm publish "${monster}/$archive" --json --no-git-checks --access public)
then
echo_fail "Failed to publish the project."
exit 1
diff --git a/nix/scripts/go-task.nix b/nix/scripts/go-task.nix
index 9c9b1dd27..6bc87c19c 100644
--- a/nix/scripts/go-task.nix
+++ b/nix/scripts/go-task.nix
@@ -8,7 +8,7 @@
scriptUpdateChangelog = pkgs'.callPackage ./update-changelog.nix {inherit pkgs' self system;};
scriptInitProject = pkgs'.callPackage ./init-project.nix {inherit pkgs' self system;};
scriptBuildStylesheets = pkgs'.callPackage ./build-stylesheets.nix {inherit pkgs' self system;};
- scriptBuildAndPublish = pkgs'.callPackage ./build-and-publish.nix {inherit pkgs' self system;};
+ scriptDeploy = pkgs'.callPackage ./deploy.nix {inherit pkgs' self system;};
scriptUpdateWebTest = pkgs'.callPackage ./update-web-test.nix {inherit pkgs' self system;};
scriptRunTests = pkgs'.callPackage ./run-tests.nix {inherit pkgs' self system;};
scriptRunWebTests = pkgs'.callPackage ./run-web-tests.nix {inherit pkgs' self system;};
@@ -119,13 +119,13 @@
aliases:
- e
- build-and-publish:
+ deploy:
silent: true
env:
USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"
desc: Build and publish the npm package
cmds:
- - ${scriptBuildAndPublish}/bin/build-and-publish
+ - ${scriptDeploy}/bin/deploy
aliases:
- p
--
GitLab