dockerise ci test for consistency

Author: test

.dockerignore

@@ -2,7 +2,6 @@
 etc/
 lib/
 .github/
-tests/
 
 *.md
 gitconvex-k8s.yml

.github/workflows/go-collab.yml

@@ -44,8 +44,7 @@ jobs:
           git config --global user.name "${{ secrets.ACTION_USER_NAME }}" && git config --global user.email "${{ secrets.ACTION_USER_EMAIL }}"
           sudo mkdir -p /usr/local/gitconvex
           sudo chown $(whoami) /usr/local/gitconvex/
-          go generate
-          make test-ci
+          make dockerise-test
 
   gitconvex-build:
     needs:

.github/workflows/go.yml

@@ -44,8 +44,7 @@ jobs:
           git config --global user.name "${{ secrets.ACTION_USER_NAME }}" && git config --global user.email "${{ secrets.ACTION_USER_EMAIL }}"
           sudo mkdir -p /usr/local/gitconvex
           sudo chown $(whoami) /usr/local/gitconvex/
-          go generate
-          make test-ci
+          make dockerise-test
 
   gitconvex-build:
     needs:

Makefile

@@ -28,6 +28,10 @@ build: clean build-ui bundle build-server
 	@echo "📬 Use ./dist/gitconvex to start Gitconvex on port 9001"
 	@echo "📬 Try ./dist/gitconvex --port PORT_NUMBER to run gitconvex on the desired port"
 
+git-testuser-setup:
+	git config user.name test
+	git config user.email [email protected]
+
 test:
 	export GITCONVEX_TEST_REPO="$(PWD)/gitconvex-test" && \
 	export GITCONVEX_DEFAULT_PATH="$(PWD)/gitconvex-test" && \
@@ -46,12 +50,16 @@ test-pretty:
  	gotestsum ./... -count=1 -cover -coverprofile=coverage.out && \
 	rm -rf $$GITCONVEX_TEST_REPO
 
-test-ci:
+test-ci: git-testuser-setup
+	go generate && \
 	go clean --cache && \
-    ./build_scripts/clone_test_repo.sh && \
+    sh ./build_scripts/clone_test_repo.sh && \
     go test ./... -count=1 -cover -coverprofile=coverage.out && \
     rm -rf $$GITCONVEX_TEST_REPO
 
+dockerise-test:
+	docker-compose -f docker-compose.test.yaml up
+
 show-coverage:
 	go tool cover -html=coverage.out
 

Test.Dockerfile

@@ -0,0 +1,11 @@
+FROM golang:1.16.0-alpine
+
+WORKDIR /home/gitconvex
+
+COPY . .
+
+# Install required packages
+RUN apk update && \
+    apk add --update libgit2-dev libssh2-dev gcc make musl-dev git
+
+

docker-compose.test.yaml

@@ -0,0 +1,18 @@
+version: "3.3"
+
+networks:
+  gitconvex-test-network:
+
+services:
+  gitconvex-test:
+    build:
+      context: .
+      dockerfile: Test.Dockerfile
+    environment:
+      - GITCONVEX_TEST_REPO=/home/gitconvex/gitconvex-test
+      - GITCONVEX_DEFAULT_PATH=/home/gitconvex/gitconvex-test
+    networks:
+      - gitconvex-test-network
+    volumes:
+      - ./:/home/gitconvex
+    command: [ "make","test-ci" ]

git/branch/git_branch_compare_test.go

@@ -33,7 +33,6 @@ func (suite *BranchCompareTestSuite) SetupSuite() {
 	}
 	suite.repo = r
 	suite.testFile = os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "compare_test.txt"
-	suite.baseBranch = "master"
 	suite.compareBranch = "new_compare"
 	addErr := NewAddBranch(r, suite.compareBranch, false, nil).AddBranch()
 	if addErr != nil {