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

chore: update git-commit call #55

parent b33e4ede
No related branches found
No related tags found
No related merge requests found
......@@ -5,8 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="9979eb22-471e-4f2f-b624-fd3edb5e8c6e" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/flake.lock" beforeDir="false" afterPath="$PROJECT_DIR$/flake.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/flake.nix" beforeDir="false" afterPath="$PROJECT_DIR$/flake.nix" afterDir="false" />
<change beforePath="$PROJECT_DIR$/nix/scripts/go-task.nix" beforeDir="false" afterPath="$PROJECT_DIR$/nix/scripts/go-task.nix" afterDir="false" />
</list>
......
......@@ -18,71 +18,7 @@
"type": "github"
}
},
"git-commit": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-8hXrOA8SKy//ctoL1poIhJwuT7G4rvVu7FguROzEoDg=",
"path": "./git-commit",
"type": "path"
},
"original": {
"path": "./git-commit",
"type": "path"
}
},
"gitlab-commit": {
"inputs": {
"git-commit": "git-commit",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1704993617,
"narHash": "sha256-++u7I3KCDgP+JhW70k5tiLfBESWVSKdVK7aei0G+mR8=",
"ref": "refs/heads/master",
"rev": "e63b1d6ae5526158fa2a1f4cd53b0ea4f4c93573",
"revCount": 18,
"type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes"
},
"original": {
"type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1704874635,
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713344939,
"narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1713344939,
"narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
......@@ -101,8 +37,7 @@
"root": {
"inputs": {
"flake-utils": "flake-utils",
"gitlab-commit": "gitlab-commit",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs"
}
},
"systems": {
......
......@@ -4,16 +4,16 @@
inputs = {
nixpkgs = {url = "github:nixos/nixpkgs/nixos-23.11";};
flake-utils = {url = "github:numtide/flake-utils";};
gitlab-commit = {url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes";};
};
outputs = {
self,
nixpkgs,
flake-utils,
gitlab-commit,
}:
flake-utils.lib.eachDefaultSystem (system: let
flake-utils.lib.eachDefaultSystem (system:
let
inherit (nixpkgs.lib) optional;
pkgs' = import nixpkgs {inherit system;};
......@@ -23,16 +23,14 @@
script-run-ci-tests = pkgs'.callPackage ./nix/scripts/run-ci-tests.nix {};
script-check-code = pkgs'.callPackage ./nix/scripts/check-code.nix {};
script-build-cover-report = pkgs'.callPackage ./nix/scripts/build-cover-report.nix {};
import-gitlab-commit = gitlab-commit.packages.${system}.git-commit;
in {
devShells = {
default = let
ciJobToken = builtins.getEnv "CI_JOB_TOKEN";
in
pkgs'.mkShell {
nativeBuildInputs = with pkgs'; [
nativeBuildInputs = with pkgs';
[
script-run-tests
script-run-extended-tests
script-run-ci-tests
......@@ -75,14 +73,7 @@
vhs
wget
zlib
] ++ (
if ciJobToken == ""
then [
import-gitlab-commit
]
else []);
];
shellHook = ''
echo "Welcome to your development environment."
'';
......
......@@ -17,6 +17,8 @@
TEST_BY_TASK: true
cmds:
- run-tests
silent: true
run-extended-tests:
desc: Execute all tests including cover, bench and race tests.
aliases:
......@@ -25,6 +27,8 @@
TEST_BY_TASK: true
cmds:
- run-extended-tests
silent: true
build-cover-report:
desc: Build coverage report.
aliases:
......@@ -33,6 +37,8 @@
TEST_BY_TASK: true
cmds:
- build-cover-report
silent: true
check-code:
desc: Check code style, linting, and formatting.
aliases:
......@@ -41,6 +47,7 @@
USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"
cmds:
- check-code
silent: true
git-commit:
desc: Commit changes.
......@@ -48,7 +55,9 @@
- gc
- commit
cmds:
- cd "{{.USER_WORKING_DIR}}" && cd $(git rev-parse --show-toplevel) && git-commit
- 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
silent: true
'';
in
pkgs.writeShellScriptBin "task" ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment