Merge pull request #36 from smartbooster/test_job_except_main

Add `main` except branch for test job + Remove deploy.mk GIT_BRANCH unused variable

.gitlab-ci.yml

@@ -32,6 +32,7 @@ test:
     - docker
   except:
     - master
+    - main
   services:
     - mysql:8.0
   variables:

CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG for 1.x
 ===================
 
+## v1.0.5 - (2024-02-06)
+### Changed
+- Also add the `main` branch to the except branch for the test job
+
+### Removed
+- `deploy.mk` removed the GIT_BRANCH variable as it is not used anymore on deploy-revision
+
 ## v1.0.4 - (2024-01-18)
 ### Changed
 - Refactor `bundle.mk` to a more targetted use case of our bundles.

make/deploy.mk

@@ -1,12 +1,6 @@
 ##
 ## Deploy
 ## ----------
-ifeq ($(shell git name-rev --name-only HEAD),remotes/origin/HEAD)
-	GIT_BRANCH=master
-else
-	GIT_BRANCH=$(shell git name-rev --name-only HEAD)
-endif
-
 .PHONY: deploy-revision
 deploy-revision: ## Create deploy revision file
 	touch public/revision.txt