additional fixes to the CI/CD workflows

Author: caffix

.github/workflows/docker.yml

@@ -13,17 +13,11 @@ jobs:
         name: Checkout
         uses: actions/checkout@v4
       -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64
-      -
-        name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
+        name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
-          install: true
-          driver-opts: network=host
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Docker meta
         id: meta
@@ -39,19 +33,25 @@ jobs:
             org.opencontainers.image.description=In-depth attack surface mapping and asset discovery
             org.opencontainers.image.vendor=OWASP Foundation
       -
-        name: Login to DockerHub
-        uses: docker/login-action@v3
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          platforms: linux/amd64,linux/arm64
+      -
+        name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+          driver-opts: network=host
       -
         name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
+          push: true
           file: ./Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
           platforms: linux/amd64,linux/arm64
-          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/goreleaser.yml

@@ -24,11 +24,6 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: 1.24.0
-      -
-        name: set up CycloneDX
-        uses: CycloneDX/gh-gomod-generate-sbom@v2
-        with:
-          version: v1
       -
         name: run GoReleaser
         uses: goreleaser/goreleaser-action@v6
@@ -37,5 +32,5 @@ jobs:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.AMASS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}