chore: correct spelling #58

.gitlab-ci.yml

@@ -44,10 +44,6 @@ test:
       paths:
         - /nix/store
 
-  artifacts:
-    paths:
-      - dist
-
 deploy:
   stage: deploy
   tags:

.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" />

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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
+
+
 ''

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"