diff --git a/nix/scripts/check-code.nix b/nix/scripts/check-code.nix index 9ed0729e81505ffdc94748165180ef51140e16b2..1f10340fdc1ba5e59d723ebd863f6f67a26785d5 100644 --- a/nix/scripts/check-code.nix +++ b/nix/scripts/check-code.nix @@ -45,13 +45,6 @@ in exit 1 fi - echo_step "Running go fmt" - if ! ${pkgs.go}/bin/go fmt . - then - echo_fail "go fmt failed" - exit 1 - fi - echo_step "Running go mod tidy" if ! ${pkgs.go}/bin/go mod tidy then diff --git a/nix/scripts/deploy.nix b/nix/scripts/deploy.nix index 01d3d2c8964660f1147add901b0e122764bd5cd8..b3243b52e01a6adeb88239fb94dd5649cbab374e 100644 --- a/nix/scripts/deploy.nix +++ b/nix/scripts/deploy.nix @@ -52,13 +52,15 @@ in ${pkgs.git}/bin/git fetch --prune --prune-tags echo_step "Bumping version" - gitVersion=v$(version predict --exit-code-if-no-bump) + gitVersion=$(version predict --exit-code-if-no-bump) if [ -z "$gitVersion" ]; then echo_ok "There is no version bump." echo_ok "done" exit 0 fi + gitVersion="v$gitVersion" + ${pkgs.git}/bin/git tag -a $gitVersion -m"chore: bump version" ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 5 ${pkgs.git}/bin/git push -o ci.skip origin ''${CI_COMMIT_REF_NAME} --tags diff --git a/nix/scripts/go-task.nix b/nix/scripts/go-task.nix index 76a71d231880f4855d3f923791156f803060d3fd..a319a257defd5ede95400fb3037f5cfb01a74e17 100644 --- a/nix/scripts/go-task.nix +++ b/nix/scripts/go-task.nix @@ -1,5 +1,7 @@ {pkgs}: let - taskfile = builtins.toFile "taskfile.yml" '' + taskfile = pkgs.writeTextFile { + name = "taskfile.yml"; + text = '' version: '3' tasks: @@ -56,13 +58,13 @@ - commit cmds: - check-code - - cd "{{.USER_WORKING_DIR}}" && cd $(git rev-parse --show-toplevel) && nix run git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes#git-commit --no-write-lock-file + - cd "{{.USER_WORKING_DIR}}" && cd $(${pkgs.git}/bin/git rev-parse --show-toplevel) && nix run git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes#git-commit --no-write-lock-file silent: true env: USER_WORKING_DIR: "{{.USER_WORKING_DIR}}" - - ''; + + }; in pkgs.writeShellScriptBin "task" '' ${pkgs.go-task}/bin/task -t "${taskfile}" "$@"