update build pipelines

kanchwala-yusuf · Jul 1, 2021 · 9442c25 · 9442c25
1 parent c59eea8
commit 9442c25
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 117 deletions.
diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
@@ -58,9 +58,6 @@ jobs:
     - name: Login to docker hub
       run: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u accurics --password-stdin
 
-    - name: Push Terrascan docker image
-      run: make docker-push
-
     - name: Push Terrascan latest docker image
       if: ${{ github.ref == 'refs/heads/master' }}
       run: make docker-push-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,25 +8,36 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    env:
+      GO111MODULE: on
+      GO_VERSION: 1.16
     steps:
       -
         name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Run Main GoReleaser
-        run: docker run -e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} --rm -v $GITHUB_WORKSPACE:/go/src/github.com/accurics/terrascan -w /go/src/github.com/accurics/terrascan neilotoole/xcgo bash -c "apt update; apt install -y gcc-multilib; goreleaser release --rm-dist -f .goreleaser.yml"
-# arm64 build disabled for now while we work through some package conflicts between gcc-multilib and gcc-aarch64-linux-gnu
-#      - name: Run GoReleaser for arm64
-#        run: docker run -e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} --rm -v $GITHUB_WORKSPACE:/go/src/github.com/accurics/terrascan -w /go/src/github.com/accurics/terrascan neilotoole/xcgo bash -c "apt update; apt install -y gcc-aarch64-linux-gnu; rm -rf /go/src/github.com/accurics/terrascan/dist ; goreleaser release --rm-dist -f .goreleaser-arm64.yml"
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # push image to Docker Hub
   push:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout Terrascan
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Build Terrascan docker image
       run: make docker-build
@@ -35,10 +46,4 @@ jobs:
       run: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u accurics --password-stdin
 
     - name: Push Terrascan latest tag docker image
-      run: make docker-push-latest-tag
-
-    - name: Build terrascan_atlantis docker image
-      run: make atlantis-docker-build
-
-    - name: Push terrascan_atlantis latest tag docker image
-      run: make atlantis-docker-push-latest-tag
+      run: make docker-push-latest-tag
diff --git a/.goreleaser-arm64.yml b/.goreleaser-arm64.yml
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -7,68 +7,13 @@ before:
     # you may remove this if you don't need go generate
     - go generate ./...
 builds:
-  - binary: terrascan
-    id: terrascan_linux_amd64
-    main: ./cmd/terrascan/main.go
-    ldflags: -s -w -extldflags=-static
-    env:
-      - CGO_ENABLED=1
-    flags:
-      - -buildmode
-      - exe
-      - -tags
-      - extended
+  - env:
+      - CGO_ENABLED=0
     goos:
       - linux
-    goarch:
-      - amd64
-  - binary: terrascan
-    id: terrascan_linux_386
-    main: ./cmd/terrascan/main.go
-    ldflags: -s -w -extldflags=-static
-    env:
-      - CGO_ENABLED=1
-    flags:
-      - -buildmode
-      - exe
-      - -tags
-      - extended
-    goos:
-      - linux
-    goarch:
-      - 386
-  - binary: terrascan
-    id: terrascan_darwin
-    main: ./cmd/terrascan/main.go
-    ldflags: -s -w
-    env:
-      - CGO_ENABLED=1
-      - CC=o64-clang
-    flags:
-      - -buildmode
-      - exe
-      - -tags
-      - extended
-    goos:
+      - windows
       - darwin
-    goarch:
-      - amd64
-  - binary: terrascan
-    id: terrascan_windows
     main: ./cmd/terrascan/main.go
-    ldflags: -s -w
-    env:
-      - CGO_ENABLED=1
-      - CC=x86_64-w64-mingw32-gcc
-    flags:
-      - -buildmode
-      - exe
-      - -tags
-      - extended
-    goos:
-      - windows
-    goarch:
-      - amd64
 archives:
   - replacements:
       darwin: Darwin
@@ -85,4 +30,4 @@ changelog:
   filters:
     exclude:
       - '^docs:'
-      - '^test:'
+      - '^test:'