update binary ci workflows to use new one

Author: mowies

.github/workflows/ci-builder.yaml

@@ -1,7 +1,7 @@
 name: CI - Builder
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -23,53 +23,12 @@ on:
       - "go.mod"
       - "go.sum"
 
-env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
-
 jobs:
-  check-goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Releases Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Checkout Core Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-          repository: "open-telemetry/opentelemetry-collector"
-          path: ".core"
-      - name: Copy Dockerfile to Core Repo directory
-        run:  cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile
-      - uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
-      - uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
-      - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-        with:
-          platforms: amd64, arm64,ppc64le
-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-      - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
-        with:
-          go-version: "~1.24"
-      - name: Check GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
-        with:
-          distribution: goreleaser-pro
-          version: ${{ env.GORELEASER_PRO_VERSION }}
-          args: check --verbose -f cmd/builder/.goreleaser.yml
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
-        with:
-          distribution: goreleaser-pro
-          version: ${{ env.GORELEASER_PRO_VERSION }}
-          args: --snapshot --clean -f cmd/builder/.goreleaser.yml
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COSIGN_YES: false
-          SKIP_SIGNS: true
+  ci:
+    uses: ./.github/workflows/base-ci-binary.yaml
+    with:
+      binary: builder
+      collector-dependency: 'open-telemetry/opentelemetry-collector'
+      dependency-target-folder: '.core'
+    secrets: inherit
+    permissions: write-all

.github/workflows/ci-opampsupervisor.yaml

@@ -5,6 +5,7 @@ on:
   push:
     branches: [main]
     paths:
+      - "distributions/otelcol/**"
       - "cmd/**"
       - ".github/**"
       - "scripts/**"
@@ -14,60 +15,20 @@ on:
   pull_request:
     branches: [main]
     paths:
+      - "distributions/otelcol/**"
       - "cmd/**"
       - ".github/**"
       - "scripts/**"
       - "Makefile"
       - "go.mod"
       - "go.sum"
 
-env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
-
 jobs:
-  check-goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Releases Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Checkout Core Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-          repository: "open-telemetry/opentelemetry-collector-contrib"
-          path: ".contrib"
-      - name: Copy Dockerfile to Core Repo directory
-        run:  cp cmd/opampsupervisor/Dockerfile .contrib/cmd/opampsupervisor/Dockerfile
-      - uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
-      - uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
-      - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-        with:
-          platforms: amd64, arm64,ppc64le
-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-      - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
-        with:
-          go-version: "~1.24"
-      - name: Check GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
-        with:
-          distribution: goreleaser-pro
-          version: ${{ env.GORELEASER_PRO_VERSION }}
-          args: check --verbose -f cmd/opampsupervisor/.goreleaser.yml
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
-        with:
-          distribution: goreleaser-pro
-          version: ${{ env.GORELEASER_PRO_VERSION }}
-          args: --snapshot --clean -f cmd/opampsupervisor/.goreleaser.yml
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COSIGN_YES: false
-          SKIP_SIGNS: true
+  ci:
+    uses: ./.github/workflows/base-ci-binary.yaml
+    with:
+      binary: opampsupervisor
+      collector-dependency: 'open-telemetry/opentelemetry-collector-contrib'
+      dependency-target-folder: '.contrib'
+    secrets: inherit
+    permissions: write-all