Forgot to put the docker build of darwin_arm64 into github workflows (#2

)
drud · Dec 13, 2020 · 7c4ef3c · 7c4ef3c
1 parent f635b49
commit 7c4ef3c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml
@@ -42,3 +42,5 @@ jobs:
         CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o "mkcert-$(git describe --tags)-windows-amd64.exe" -ldflags "-X main.Version=$(git describe --tags)"
         CGO_ENABLED=0 GOOS=windows GOARCH=arm go build -o "mkcert-$(git describe --tags)-windows-arm.exe" -ldflags "-X main.Version=$(git describe --tags)"
         CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o "mkcert-$(git describe --tags)-windows-386.exe" -ldflags "-X main.Version=$(git describe --tags)"
+    # TODO: When golang v1.16 comes out, make this a simple build using go instead of gotip (lose docker)
+        docker run --rm -w /workdir -v "$(PWD):/workdir" -e GOPATH="/go" -e "GOCACHE=/workdir/.gotmp"  drud/golang-build-container:v1.15.6 bash -c "CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 gotip build -o \"mkcert-$(git describe --tags)-darwin-arm64\" -ldflags \"-X main.Version=$(git describe --tags)\" "
diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml
@@ -39,6 +39,8 @@ jobs:
         CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o "mkcert-$(git describe --tags)-windows-amd64.exe" -ldflags "-X main.Version=$(git describe --tags)"
         CGO_ENABLED=0 GOOS=windows GOARCH=arm go build -o "mkcert-$(git describe --tags)-windows-arm.exe" -ldflags "-X main.Version=$(git describe --tags)"
         CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o "mkcert-$(git describe --tags)-windows-386.exe" -ldflags "-X main.Version=$(git describe --tags)"
+    # TODO: When golang v1.16 comes out, make this a simple build using go instead of gotip (lose docker)
+        docker run --rm -w /workdir -v "$(PWD):/workdir" -e GOPATH="/go" -e "GOCACHE=/workdir/.gotmp"  drud/golang-build-container:v1.15.6 bash -c "CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 gotip build -o \"mkcert-$(git describe --tags)-darwin-arm64\" -ldflags \"-X main.Version=$(git describe --tags)\" "
 
     - name: Publish artifacts
       uses: ncipollo/release-action@v1

diff --git a/.travis.yml b/.travis.yml
@@ -14,15 +14,6 @@ script:
   # TODO: When golang v1.16 comes out, make this a simple build using go instead of gotip (lose docker)
   - docker run --rm -w /workdir -v "$(PWD):/workdir" -e GOPATH="/go" -e "GOCACHE=/workdir/.gotmp"  drud/golang-build-container:v1.15.6 bash -c "CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 gotip build -o \"mkcert-$(git describe --tags)-darwin-arm64\" -ldflags \"-X main.Version=$(git describe --tags)\" "
 
-  DOCKERBUILDCMD=docker run -t --rm                     \
-  -v "/$(PWD)://workdir$(DOCKERMOUNTFLAG)"                              \
-  -e GOPATH="//workdir/$(GOTMP)" \
-  -e GOCACHE="//workdir/$(GOTMP)/.cache" \
-  -e GOFLAGS="$(USEMODVENDOR)" \
-  -e CGO_ENABLED=0 \
-  -w //workdir              \
-  $(BUILD_IMAGE)
-
 deploy:
   provider: releases
   skip_cleanup: true