modify Makefile and run tests on Darwin in CI

Signed-off-by: Sanskar Jaiswal <[email protected]>

Author: aryan9600

.github/workflows/build.yaml

@@ -22,20 +22,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Test build script for darwin-amd64
+      - name: Test build script for darwin-amd64 - libgit2-all
         run: |
-          TARGET_DIR=${GITHUB_WORKSPACE}/build/libgit2-darwin-amd64 \
-          BUILD_ROOT_DIR=${GITHUB_WORKSPACE}/libgit2/build/amd \
-          ./hack/static.sh all
+          make dev-test
+          rm -rf ${GITHUB_WORKSPACE}/build rm -rf ${GITHUB_WORKSPACE}/libgit2
         env:
           MACOSX_DEPLOYMENT_TARGET: 10.15
-      - name: Test cross compile script for darwin-arm64
+      - name: Test build script for darwin-amd64 - libgit2-only
         run: |
-          TARGET_DIR=${GITHUB_WORKSPACE}/build/libgit2-darwin-arm64 \
-          BUILD_ROOT_DIR=${GITHUB_WORKSPACE}/libgit2/build/arm \
-          TARGET_ARCH=arm64 \
-          CMAKE_APPLE_SILICON_PROCESSOR=arm64 \
-          ./hack/static.sh all
+          LIBGIT2_ONLY=true make dev-test
         env:
           MACOSX_DEPLOYMENT_TARGET: 10.15
 

Makefile

@@ -2,8 +2,10 @@ TAG ?= latest
 
 ifeq ($(LIBGIT2_ONLY),true)
 	IMG ?= ghcr.io/fluxcd/golang-with-libgit2-only
+	DOCKERFILE ?= Dockerfile.libgit2-only
 else
 	IMG ?= ghcr.io/fluxcd/golang-with-libgit2-all
+	DOCKERFILE ?= Dockerfile
 endif
 
 PLATFORMS ?= linux/amd64,linux/arm/v7,linux/arm64
@@ -43,51 +45,33 @@ GO_STATIC_FLAGS=-tags 'netgo,osusergo,static_build'
 
 .PHONY: build
 build:
-ifeq ($(LIBGIT2_ONLY),true)
-	docker buildx build \
-		--platform=$(PLATFORMS) \
-		--tag $(IMG):$(TAG) \
-		--file Dockerfile.libgit2-only \
-		$(BUILD_ARGS) .
-else
 	docker buildx build \
 		--platform=$(PLATFORMS) \
 		--tag $(IMG):$(TAG) \
-		--file Dockerfile \
+		--file $(DOCKERFILE) \
 		$(BUILD_ARGS) .
-endif
 
 .PHONY: test
 test:
-ifeq ($(LIBGIT2_ONLY),true)
-	docker buildx build \
-		--platform=$(PLATFORMS) \
-		--tag $(IMG):$(TAG)-test \
-		--build-arg LIBGIT2_IMG=$(IMG) \
-		--build-arg LIBGIT2_TAG=$(TAG) \
-		--file Dockerfile.test-libgit2-only \
-		$(BUILD_ARGS) .
-else
 	docker buildx build \
 		--platform=$(PLATFORMS) \
 		--tag $(IMG):$(TAG)-test \
 		--build-arg LIBGIT2_IMG=$(IMG) \
 		--build-arg LIBGIT2_TAG=$(TAG) \
-		--file Dockerfile.test \
+		--file $(DOCKERFILE) \
 		$(BUILD_ARGS) .
-endif
 
 .PHONY: builder
 builder:
-# create local builder
+	# create local builder
 	docker buildx create --name local-builder \
 		--platform $(PLATFORMS) \
 		--driver-opt network=host \
 		--driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=1073741274 \
 		--driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=5000000000000 \
 		--buildkitd-flags '--allow-insecure-entitlement security.insecure' \
 		--use
-# install qemu emulators
+	# install qemu emulators
 	docker run -it --rm --privileged tonistiigi/binfmt --install all
 
 $(LIBGIT2): $(MUSL-CC)
@@ -100,11 +84,7 @@ else
 		./hack/static.sh all
 endif
 else
-ifeq ($(LIBGIT2_ONLY),true)
 	IMG_TAG=$(IMG):$(TAG) ./hack/extract-libraries.sh
-else
-	IMG_TAG=$(IMG):$(TAG) ./hack/extract-libraries.sh
-endif
 endif
 
 $(MUSL-CC):