[chore] Combine OCB and OpAMP release/CI pipelines

.github/workflows/base-binary-release.yaml

@@ -0,0 +1,123 @@
+name: Reusable binary release workflow
+on:
+  workflow_call:
+    inputs:
+      binary:
+        required: true
+        type: string
+        description: "Which binary to release. Possible options: ['builder', 'opampsupervisor']"
+      collector-dependency:
+        required: false
+        type: string
+        default: ""
+        description: "Set this to the repo slug of collector core or contrib to check out if it's needed as a dependency"
+      dependency-target-folder:
+        required: false
+        type: string
+        default: ""
+        description: "The collector dependency will be put into this folder"
+
+env:
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.2
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      packages: write
+      contents: write
+
+    steps:
+      - name: Checkout Releases Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      - name: Set goreleaser last tag reference in case of non-nightly release
+        id: prev-tag
+        if: ${{ !contains(github.ref, '-nightly') }}
+        # find previous tag by taking only binary tags, filtering out nightly tags and then choosing the
+        # second to last tag (last one is the current release)
+        run: |
+          prev_tag=$(git tag | grep "cmd/${{ inputs.binary }}" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1)
+          echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT"
+
+      - name: Set nightly enabled
+        id: nightly-check
+        if: ${{ contains(github.ref, '-nightly') }}
+        run: |
+          echo "NIGHTLY_FLAG=--nightly" >> "$GITHUB_OUTPUT"
+
+      - name: Set COLLECTOR_REF
+        id: collector-ref
+        run: |
+          if [ '${{ contains(github.ref, '-nightly') }}' == 'true' ]; then
+            echo "COLLECTOR_REF=main" >> "$GITHUB_OUTPUT"
+          else
+            echo "COLLECTOR_TAG=${{ github.ref }}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Push ${{ inputs.binary }} Tag
+        run: |
+          tag="cmd/${{ inputs.binary }}/${{ github.ref_name }}"
+          message="Releasing ${{ inputs.binary }} binaries for ${{ steps.collector-ref.outputs.COLLECTOR_REF }}"
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+          git tag -a "${tag}" -m "${message}"
+          git push origin "${tag}"
+
+      - name: Checkout Collector dependency repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+          repository: ${{ inputs.collector-dependency }}
+          ref: ${{ steps.collector-ref.outputs.COLLECTOR_REF }}
+          path: ${{ inputs.dependency-target-folder }}
+
+      - name: Copy Dockerfile to Collector dependency directory
+        run: cp cmd/${{ inputs.binary }}/Dockerfile ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}/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,riscv64
+
+      - 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: Log into Docker.io
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
+
+      - name: Login to GitHub Package Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
+        with:
+          distribution: goreleaser-pro
+          version: ${{ env.GORELEASER_PRO_VERSION }}
+          args: release --clean -f cmd/${{ inputs.binary }}/.goreleaser.yml ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }}
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COSIGN_YES: true
+          SKIP_SIGNS: false
+          GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.PREVIOUS_RELEASE_TAG }}
+          GORELEASER_CURRENT_TAG: ${{ github.ref_name }}

.github/workflows/base-ci-binary.yaml

@@ -0,0 +1,80 @@
+name: CI - Binaries
+
+on:
+  workflow_call:
+    inputs:
+      binary:
+        required: true
+        type: string
+        description: "Which binary to build. Possible options: ['builder', 'opampsupervisor']"
+      collector-dependency:
+        required: false
+        type: string
+        default: ""
+        description: "Set this to the repo slug of collector core or contrib to check out if it's needed as a dependency"
+      dependency-target-folder:
+        required: false
+        type: string
+        default: ""
+        description: "The collector dependency will be put into this folder"
+
+
+env:
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.2
+
+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 Collector dependency repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+          repository: ${{ inputs.collector-dependency }}
+          path: ${{ inputs.dependency-target-folder }}
+
+      - name: Copy Dockerfile to Core Repo directory
+        run: cp cmd/${{ inputs.binary }}/Dockerfile ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}/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,riscv64
+
+      - 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/${{ inputs.binary }}/.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/${{ inputs.binary }}/.goreleaser.yml
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COSIGN_YES: false
+          SKIP_SIGNS: true

.github/workflows/ci-builder.yaml

@@ -27,53 +27,12 @@ on:
       - "go.mod"
       - "go.sum"
 
-env:
-  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.11.2
-
 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,riscv64
-      - 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

@@ -7,6 +7,7 @@ on:
       - main
       - release/*
     paths:
+      - "distributions/otelcol/**"
       - "cmd/**"
       - ".github/**"
       - "scripts/**"
@@ -18,60 +19,20 @@ on:
       - main
       - release/*
     paths:
+      - "distributions/otelcol/**"
       - "cmd/**"
       - ".github/**"
       - "scripts/**"
       - "Makefile"
       - "go.mod"
       - "go.sum"
 
-env:
-  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.11.2
-
 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