From b24c3747ab07175ba7a659ddccec60e0dd47e708 Mon Sep 17 00:00:00 2001 From: Thomas Labarussias Date: Thu, 12 Oct 2023 21:36:49 +0200 Subject: [PATCH] update GHA for main branch Signed-off-by: Thomas Labarussias --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 24 +++++++----------------- mageFile.go | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 531ddd3a..f25e50d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,4 +40,4 @@ jobs: uses: magefile/mage-action@v2 with: version: latest - args: build + args: build \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1516eff8..1b551f10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,12 @@ jobs: uses: goreleaser/goreleaser-action@v4 with: install-only: true + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Run Mage uses: magefile/mage-action@v2 @@ -37,20 +43,4 @@ jobs: version: latest args: release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Push images to Dockerhub - run: | - docker manifest push --purge issif/falco-talon:latest \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/mageFile.go b/mageFile.go index ce817957..b8f3c312 100644 --- a/mageFile.go +++ b/mageFile.go @@ -56,7 +56,7 @@ func Build() error { mg.Deps(Test) exportLDFlags() - return sh.RunV("goreleaser", "release", "--clean", "--snapshot", "--skip-sign", "--skip-sbom", "--skip-publish") + return sh.RunV("goreleaser", "release", "--clean", "--skip-sign", "--skip-sbom", "--skip-publish") } func Release() error {