From 128a7697358fcbacfec5ab51e136a7c0036d6563 Mon Sep 17 00:00:00 2001
From: Yevgeny Pats <yev.pats@gmail.com>
Date: Sun, 7 Feb 2021 09:16:01 +0200
Subject: [PATCH] Use ghcr.io/cloudquery/golang-cross:latest for cross-compile

---
 .github/workflows/release.yml | 4 +---
 .goreleaser.yaml              | 5 ++---
 Makefile                      | 7 +++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 726c6b0e5..9967fad8b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,8 +17,6 @@ jobs:
       - name: release dry run
         run: make release-dry-run
       - name: setup release environment
-        run: |-
-          echo "${{secrets.GORELEASER_GITHUB_TOKEN}}" | docker login ghcr.io --username $GITHUB_ACTOR --password-stdin
-          echo 'GITHUB_TOKEN=${{secrets.GORELEASER_GITHUB_TOKEN}}' > .release-env
+        run: echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env
       - name: release publish
         run: make release
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index fb453ad44..442d3b374 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -8,9 +8,8 @@ builds:
     env:
       - CGO_ENABLED=1
       - GO111MODULE=on
-      - CC=$PWD/gencc.sh
-      - CXX=$PWD/gencpp.sh
-    main: ./provider.go
+      - CC=/usr/bin/gencc.sh
+      - CXX=/usr/bin/gencpp.sh
     ldflags:
      - -s -w -X github.com/cloudquery/cloudquery/cmd.Version={{.Version}} -X github.com/cloudquery/cloudquery/cmd.Commit={{.Commit}} -X github.com/cloudquery/cloudquery/cmd.Date={{.Date}}
     goos:
diff --git a/Makefile b/Makefile
index 95dec474a..53962a9db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-PACKAGE_NAME          := github.com/troian/golang-cross-example
-GOLANG_CROSS_VERSION  ?= v1.15.2
+PACKAGE_NAME          := github.com/cloudquery/cq-provider-aws
 
 .PHONY: release-dry-run
 release-dry-run:
@@ -9,7 +8,7 @@ release-dry-run:
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
-		troian/golang-cross:${GOLANG_CROSS_VERSION} \
+		ghcr.io/cloudquery/golang-cross:latest \
 		--rm-dist --skip-validate --skip-publish
 
 .PHONY: release
@@ -27,5 +26,5 @@ release:
 		-v ~/.docker:/root/.docker \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
-		troian/golang-cross:${GOLANG_CROSS_VERSION} \
+		ghcr.io/cloudquery/golang-cross:latest \
 		release --rm-dist