From 1f1348aece0ecf4b445d0640bb58dda53b882405 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 21 Apr 2024 13:44:05 +0200
Subject: [PATCH] chore: correct spelling #58

---
 .gitlab-ci.yml                     |  4 ----
 .idea/workspace.xml                | 16 ++++++++++++----
 database-1_test.go                 |  2 +-
 database-2_test.go                 |  2 +-
 database-3_test.go                 |  2 +-
 database-4_test.go                 |  2 +-
 database-5_test.go                 |  2 +-
 database-6_test.go                 |  2 +-
 database-7_test.go                 |  2 +-
 database-8_test.go                 |  4 ++--
 database_test.go                   |  6 +++---
 flake.nix                          |  4 ++--
 job-syncer_test.go                 |  2 +-
 nix/scripts/clean-up.nix           |  2 +-
 nix/scripts/common.nix             | 26 ++++++++++++++------------
 nix/scripts/deploy.nix             |  9 ++++-----
 nix/scripts/go-task.nix            |  2 +-
 nix/scripts/run-extended-tests.nix |  4 ++--
 18 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f959fb..7c68bb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,10 +43,6 @@ test:
     - key: nixos
       paths:
         - /nix/store
-  
-  artifacts:
-    paths:
-      - dist
 
 deploy:
   stage: deploy
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 74c38da..969608d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,18 @@
     <list default="true" id="9979eb22-471e-4f2f-b624-fd3edb5e8c6e" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" 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/cleanup.nix" beforeDir="false" afterPath="$PROJECT_DIR$/nix/scripts/clean-up.nix" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nix/scripts/go-task.nix" beforeDir="false" afterPath="$PROJECT_DIR$/nix/scripts/go-task.nix" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nix/scripts/run-extended-tests.nix" beforeDir="false" afterPath="$PROJECT_DIR$/nix/scripts/run-extended-tests.nix" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database-1_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-1_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database-2_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-2_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database-3_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-3_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database-4_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-4_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database-5_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-5_test.go" 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-7_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-7_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database-8_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database-8_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/database_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/job-syncer_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/job-syncer_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nix/scripts/common.nix" beforeDir="false" afterPath="$PROJECT_DIR$/nix/scripts/common.nix" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nix/scripts/deploy.nix" beforeDir="false" afterPath="$PROJECT_DIR$/nix/scripts/deploy.nix" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/database-1_test.go b/database-1_test.go
index f4fd3a5..47348a9 100644
--- a/database-1_test.go
+++ b/database-1_test.go
@@ -17,7 +17,7 @@ func TestWriteToDB1(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-2_test.go b/database-2_test.go
index 43f58c1..9fc3f11 100644
--- a/database-2_test.go
+++ b/database-2_test.go
@@ -16,7 +16,7 @@ import (
 func TestWriteToDB2(t *testing.T) {
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-3_test.go b/database-3_test.go
index 4e7b557..917841a 100644
--- a/database-3_test.go
+++ b/database-3_test.go
@@ -16,7 +16,7 @@ func TestWriteToDB3(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-4_test.go b/database-4_test.go
index ef1bc0a..37e17bf 100644
--- a/database-4_test.go
+++ b/database-4_test.go
@@ -14,7 +14,7 @@ func TestWriteToDB4(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-5_test.go b/database-5_test.go
index 236d552..e8a37b1 100644
--- a/database-5_test.go
+++ b/database-5_test.go
@@ -13,7 +13,7 @@ func TestWriteToDB5(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-6_test.go b/database-6_test.go
index d73048a..cbb750d 100644
--- a/database-6_test.go
+++ b/database-6_test.go
@@ -25,7 +25,7 @@ func TestWriteToDB6(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-7_test.go b/database-7_test.go
index 65d2748..459fd98 100644
--- a/database-7_test.go
+++ b/database-7_test.go
@@ -13,7 +13,7 @@ import (
 func TestCreateOrUpdateJob(t *testing.T) {
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database-8_test.go b/database-8_test.go
index a87cdac..dfd8f91 100644
--- a/database-8_test.go
+++ b/database-8_test.go
@@ -14,7 +14,7 @@ import (
 func TestUpdateJob(t *testing.T) {
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
@@ -53,7 +53,7 @@ func TestCheckAndSaveOrUpdate(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/database_test.go b/database_test.go
index 69a0035..2395612 100644
--- a/database_test.go
+++ b/database_test.go
@@ -14,7 +14,7 @@ import (
 func TestDeleteJob(t *testing.T) {
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
@@ -57,7 +57,7 @@ func TestDeleteJob(t *testing.T) {
 func TestResetLogs(t *testing.T) {
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
@@ -109,7 +109,7 @@ func TestResetLogs(t *testing.T) {
 func TestResetStats(t *testing.T) {
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/flake.nix b/flake.nix
index c2558ef..578be35 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,7 @@
       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 {};
-      
+
       script-clean-up = pkgs'.callPackage ./nix/scripts/clean-up.nix {};
       script-deploy = pkgs'.callPackage ./nix/scripts/deploy.nix {};
 
@@ -41,7 +41,7 @@
               script-check-code
               script-build-cover-report
               script-task
-              
+
               script-clean-up
               script-deploy
 
diff --git a/job-syncer_test.go b/job-syncer_test.go
index 09e796b..6670f47 100644
--- a/job-syncer_test.go
+++ b/job-syncer_test.go
@@ -17,7 +17,7 @@ func TestSaveJobWithSQLite(t *testing.T) {
 
 	gormDB, err := gorm.Open(sqlite.Open("file:unique_id?mode=memory&cache=shared"), &gorm.Config{})
 	if err != nil {
-		t.Fatalf("a error occurred while opening the database: %v", err)
+		t.Fatalf("an error occurred while opening the database: %v", err)
 	}
 	t.Cleanup(func() {
 		sqlDB, err := gormDB.DB()
diff --git a/nix/scripts/clean-up.nix b/nix/scripts/clean-up.nix
index 4b80e16..d6669d7 100644
--- a/nix/scripts/clean-up.nix
+++ b/nix/scripts/clean-up.nix
@@ -13,7 +13,7 @@ in
     echo_step "Removing credentials"
     ${pkgs.git}/bin/git config --global --unset credential.helper
     if [ -f /root/.docker/config.json ]; then rm /root/.docker/config.json; fi
-    
+
     echo_ok "Cleaned up"
 
   ''
diff --git a/nix/scripts/common.nix b/nix/scripts/common.nix
index 522d5c3..ffe59da 100644
--- a/nix/scripts/common.nix
+++ b/nix/scripts/common.nix
@@ -91,18 +91,6 @@
    }$1" | ${pkgs.gnused}/bin/sed 's/\\/\\\\/g; s/"/\\"/g; s/$/\\n/g' | tr -d '\n'
   }
 
-  if [ -z "$DEBUG_MODE" ]; then
-    DEBUG_MODE='false'
-  fi
-
-  if [ -n "$CI_JOB_TOKEN" ]; then
-    CI_MODE='true'
-  fi
-
-  if is_true "$DEBUG_MODE" || is_true "$CI_MODE"; then
-    set -x
-  fi
-
   download_test_images() {
 
       echo_step "Downloading docker images"
@@ -141,4 +129,18 @@
       fi
   }
 
+
+  if [ -z "$DEBUG_MODE" ]; then
+    DEBUG_MODE='false'
+  fi
+
+  if [ -n "$CI_JOB_TOKEN" ]; then
+    CI_MODE='true'
+  fi
+
+  if is_true "$DEBUG_MODE" || is_true "$CI_MODE"; then
+    set -x
+  fi
+
+
 ''
diff --git a/nix/scripts/deploy.nix b/nix/scripts/deploy.nix
index e82bab6..20c38e4 100644
--- a/nix/scripts/deploy.nix
+++ b/nix/scripts/deploy.nix
@@ -43,19 +43,18 @@ in
     ${pkgs.git}/bin/git checkout $CI_COMMIT_REF_NAME
     ${pkgs.git}/bin/git pull origin $CI_COMMIT_REF_NAME
 
-    ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline
-    ${pkgs.git}/bin/git fetch --prune --prune-tags
-
-    if ! ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline
+    if ! ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 30
     then
         echo_fail "Error: Could not get git log."
         exit 1
     fi
 
+     ${pkgs.git}/bin/git fetch --prune --prune-tags
+
     echo_step "Bumping version"
     gitVersion=v$(version predict)
     ${pkgs.git}/bin/git tag -a $gitVersion -m"chore: bump version"
-    ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline
+    ${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
 
     echo_ok "done"
diff --git a/nix/scripts/go-task.nix b/nix/scripts/go-task.nix
index 19cd514..76a71d2 100644
--- a/nix/scripts/go-task.nix
+++ b/nix/scripts/go-task.nix
@@ -24,7 +24,7 @@
           - ret
         env:
           TEST_BY_TASK: true
-          USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"          
+          USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"
         cmds:
           - run-extended-tests
         silent: true
diff --git a/nix/scripts/run-extended-tests.nix b/nix/scripts/run-extended-tests.nix
index 04276ae..30b5654 100644
--- a/nix/scripts/run-extended-tests.nix
+++ b/nix/scripts/run-extended-tests.nix
@@ -38,14 +38,14 @@ in
       exit 1
     fi
     echo_ok "race tests passed"
-    
+
     echo_step "Running fuzz tests"
     if ! ${pkgs.go}/bin/go test -tags "runOnTask,fuzz" -fuzz ./...
     then
       echo_fail "Failed to run fuzz tests"
       exit 1
     fi
-    
+
     echo_ok "Fuzz tests passed"
     echo_ok "All tests passed"
 
-- 
GitLab