Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Job Queues
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Libraries
Go
Services
Job Queues
Commits
b33e4ede
Verified
Commit
b33e4ede
authored
1 year ago
by
Volker Schukai
Browse files
Options
Downloads
Patches
Plain Diff
chore: integrate git-commit script
#54
parent
544fef0d
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+1
-1
1 addition, 1 deletion
.gitignore
.idea/workspace.xml
+3
-47
3 additions, 47 deletions
.idea/workspace.xml
flake.nix
+9
-10
9 additions, 10 deletions
flake.nix
nix/scripts/go-task.nix
+14
-1
14 additions, 1 deletion
nix/scripts/go-task.nix
with
27 additions
and
59 deletions
.gitignore
+
1
−
1
View file @
b33e4ede
...
...
@@ -13,4 +13,4 @@ smell.go
/.attach_*
.direnv/
.direnv/
.back
.back
/
This diff is collapsed.
Click to expand it.
.idea/workspace.xml
+
3
−
47
View file @
b33e4ede
...
...
@@ -5,54 +5,10 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"9979eb22-471e-4f2f-b624-fd3edb5e8c6e"
name=
"Changes"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/.back/scripts/hello.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/.golangci.yaml"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/flake.lock"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/flake.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/build-cover-report.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/check-code.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/common.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/go-task.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/run-ci-tests.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/run-extended-tests.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/nix/scripts/run-tests.nix"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/schedule-time_test.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.envrc"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.envrc"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.gitignore"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.gitignore"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.gitlab-ci.yml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.gitlab-ci.yml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/.gitignore"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/aws.xml"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/go.imports.xml"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/job-queues.iml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/job-queues.iml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/markdown.xml"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/misc.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/misc.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/README.md"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/README.md"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Taskfile.yml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.back/Taskfile.yml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/database-6_test.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/database-6_test.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/database.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/database.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/database_test.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/database_test.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/devenv.lock"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/devenv.nix"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/devenv.yaml"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/errors.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/errors.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/event-bus_test.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/event-bus_test.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/go.mod"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/go.mod"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/go.sum"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/go.sum"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/job-generic.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/job-generic.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/job-syncer.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/job-syncer.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/job.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/job.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/logger.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/logger.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/manager.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/manager.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/queue.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/queue.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/runnable-fileoperation.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/runnable-fileoperation.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/runnable-mail_test.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/runnable-mail_test.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/runnable-sftp_test.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/runnable-sftp_test.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/schedule-time.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/schedule-time.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/scheduler-inotify.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/scheduler-inotify.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/stat.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/stat.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/worker.go"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/worker.go"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
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>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
9
−
10
View file @
b33e4ede
...
...
@@ -26,17 +26,10 @@
import
-
gitlab-commit
=
gitlab-commit
.
packages
.
${
system
}
.
git-commit
;
# ciJobToken = builtins.getEnv "CI_JOB_TOKEN";
# gitCommit =
# if ciJobToken == ""
# then (builtins.getFlake "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes").packages.${builtins.currentSystem}.git-commit
# else "";
in
{
devShells
=
{
default
=
let
ciJobToken
=
builtins
.
getEnv
"CI_JOB_TOKEN"
;
in
pkgs
'
.
mkShell
{
nativeBuildInputs
=
with
pkgs
'
;
[
...
...
@@ -46,7 +39,6 @@
script-check-code
script-build-cover-report
script-task
import
-
gitlab-commit
alejandra
blackbox
...
...
@@ -83,7 +75,14 @@
vhs
wget
zlib
];
]
++
(
if
ciJobToken
==
""
then
[
import
-
gitlab-commit
]
else
[]);
shellHook
=
''
echo "Welcome to your development environment."
''
;
...
...
This diff is collapsed.
Click to expand it.
nix/scripts/go-task.nix
+
14
−
1
View file @
b33e4ede
...
...
@@ -9,15 +9,18 @@
cmds:
- task --list
silent: true
run-tests:
desc: Execute all tests.
aliases:
- rt
env:
TEST_BY_TASK: true
cmds:
- run-tests
run-extended-tests:
desc: Execute all tests including cover, bench and race tests.
aliases:
- ret
env:
TEST_BY_TASK: true
cmds:
...
...
@@ -32,10 +35,20 @@
- build-cover-report
check-code:
desc: Check code style, linting, and formatting.
aliases:
- cc
env:
USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"
cmds:
- check-code
git-commit:
desc: Commit changes.
aliases:
- gc
- commit
cmds:
- cd "{{.USER_WORKING_DIR}}" && cd $(git rev-parse --show-toplevel) && git-commit
''
;
in
pkgs
.
writeShellScriptBin
"task"
''
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment