Skip to content
Snippets Groups Projects
Verified Commit 947b443a authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix: wip new pipeline

parent 88473ebf
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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 = [
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment