From 2a916916cb95f5f843f9e5b6ec00d157d71a727e Mon Sep 17 00:00:00 2001
From: Rory Crispin <rorycr@icloud.com>
Date: Wed, 6 Sep 2023 10:51:19 +0100
Subject: [PATCH] Fix auth to GCP, drop building RPM/DEBs

---
 .github/workflows/build-test-publish.yaml | 52 ++---------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/build-test-publish.yaml b/.github/workflows/build-test-publish.yaml
index 067128085d6c..672debb5be12 100644
--- a/.github/workflows/build-test-publish.yaml
+++ b/.github/workflows/build-test-publish.yaml
@@ -368,56 +368,12 @@ jobs:
           name: collector-binaries
           path: ./bin/*
 
-  build-package:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
-    needs: [cross-compile]
-    strategy:
-      fail-fast: false
-      matrix:
-        package_type: ["deb", "rpm"]
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "2.6"
-      - name: Install fpm
-        run: gem install --no-document fpm -v 1.11.0
-      - name: Download Collector Binaries
-        uses: actions/download-artifact@v3
-        with:
-          name: collector-binaries
-          path: bin/
-      - run: chmod +x bin/*
-      # - name: Set Release Tag
-      #   id: github_tag
-      #   run: ./.github/workflows/scripts/set_release_tag.sh
-      - name: Build ${{ matrix.package_type }} amd64 package
-        run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "0.0.${{ github.run_id }}" "amd64" "./dist/"
-      # - name: Build ${{ matrix.package_type }} arm64 package
-      #   run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "0.0.${{ github.run_id }}" "arm64" "./dist/"
-      # - name: Build ${{ matrix.package_type }} ppc64le package
-      #   run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "0.0.${{ github.run_id }}" "ppc64le" "./dist/"
-      - name: Test ${{ matrix.package_type }} package
-        run: |
-          if [[ "${{ matrix.package_type }}" = "deb" ]]; then
-              ./internal/buildscripts/packaging/fpm/test.sh dist/otel-contrib-collector*amd64.deb examples/tracing/otel-collector-config.yml
-          else
-              ./internal/buildscripts/packaging/fpm/test.sh dist/otel-contrib-collector*x86_64.rpm examples/tracing/otel-collector-config.yml
-          fi
-      - name: Upload Packages
-        uses: actions/upload-artifact@v3
-        with:
-          name: collector-packages
-          path: ./dist/*
-
   publish-dev:
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     runs-on: ubuntu-latest
-    needs: [lint, unittest, integration-tests, build-package]
+    needs: [lint, unittest, integration-tests, cross-compile]
     if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     steps:
       - name: Checkout Repo