chore: test ci optimizations

Author: mailo-nr

.github/workflows/ci-base.yaml

@@ -55,9 +55,34 @@ jobs:
       - name: Tidy go.mod files
         run: go mod tidy
 
-      - name: Verify build
+      - name: Generate cache keys
+        id: cache-keys
+        run: |
+          # Base hash for source generation (inputs that affect generation)
+          SOURCE_HASH="${{ hashFiles('distributions/${{ inputs.distribution }}/manifest.yaml', 'distributions/${{ inputs.distribution }}/_build/go.mod', 'distributions/${{ inputs.distribution }}/_build/go.sum', 'Makefile') }}"
+          # Extended hash for Docker build (includes generated sources)
+          DOCKER_HASH="${{ hashFiles('distributions/${{ inputs.distribution }}/Dockerfile', 'distributions/${{ inputs.distribution }}/manifest.yaml', 'distributions/${{ inputs.distribution }}/_build/go.mod', 'distributions/${{ inputs.distribution }}/_build/go.sum') }}"
+          echo "source_key=generate-sources-${{ inputs.distribution }}-${SOURCE_HASH}" >> $GITHUB_OUTPUT
+          echo "docker_key=${{ inputs.distribution }}-${{ github.ref_name }}-${DOCKER_HASH}" >> $GITHUB_OUTPUT
+
+      - name: Cache sources
+        id: cache-sources
+        uses: actions/cache@v4
+        with:
+          path: distributions/${{ inputs.distribution }}/_build
+          key: ${{ steps.cache-keys.outputs.source_key }}
+          restore-keys: |
+            generate-sources-${{ inputs.distribution }}-${{ hashFiles('distributions/${{ inputs.distribution }}/manifest.yaml') }}
+            generate-sources-${{ inputs.distribution }}-
+
+      - name: Generate sources
+        if: steps.cache-sources.outputs.cache-hit != 'true'
         run: make ci DISTRIBUTIONS=${{ inputs.distribution }}
 
+      - name: Skip source generation (cached)
+        if: steps.cache-sources.outputs.cache-hit == 'true'
+        run: echo "✅ Source generation skipped - no source changes detected"
+
       - name: Login to Docker
         uses: docker/login-action@v3
         if: ${{ env.ACT }}
@@ -92,10 +117,8 @@ jobs:
         run: |
           if [ ${{ inputs.nightly }} = "true" ]; then
             echo "goreleaser_args=--snapshot --clean --skip=publish,validate --timeout 2h --config .goreleaser-nightly.yaml" >> $GITHUB_ENV
-          elif [ ${{github.event.pull_request.user.login == 'dependabot[bot]' }} ]; then
-            echo "goreleaser_args=--snapshot --clean --skip=publish,validate,sign --timeout 2h" >> $GITHUB_ENV
           else
-            echo "goreleaser_args=--snapshot --clean --skip=publish,validate --timeout 2h" >> $GITHUB_ENV
+            echo "goreleaser_args=build --single-target --snapshot --clean" >> $GITHUB_ENV
           fi
 
       - name: Build binaries & packages with GoReleaser
@@ -112,7 +135,8 @@ jobs:
           args: ${{ env.goreleaser_args }}
           workdir: distributions/${{ inputs.distribution }}
 
-      - name: Extract relevant metadata
+      - name: Extract relevant metadata from GoReleaser output
+        if: ${{ inputs.nightly }} = "true"
         run: |
           VERSION=$(echo '${{ steps.goreleaser.outputs.metadata }}' | jq -r '.version')
           ARCH=$(echo '${{ runner.arch }}' | sed 's/X/amd/g')
@@ -125,6 +149,29 @@ jobs:
             echo "image_tag=$VERSION-$ARCH" >> $GITHUB_ENV
           fi
 
+      - name: Copy GoReleaser binary to Docker context
+        if: ${{ inputs.nightly }} = "false"
+        run: |
+          cd distributions/${{ inputs.distribution }}
+          BINARY_PATH="$(find dist -name "${{ inputs.distribution }}_linux_amd64*" -type d)/${{ inputs.distribution }}"
+          cp "$BINARY_PATH" ./${{ inputs.distribution }}
+
+      - name: Build and load Docker image
+        uses: docker/build-push-action@v5
+        if: ${{ inputs.nightly }} = "false"
+        with:
+          context: distributions/${{ inputs.distribution }}
+          platforms: linux/amd64
+          push: false
+          load: true
+          tags: |
+            ${{ secrets.registry }}/${{ inputs.distribution }}:${{ env.image_tag }}
+          cache-from: |
+            type=gha,scope=${{ steps.cache-keys.outputs.docker_key }}
+            type=gha,scope=${{ inputs.distribution }}-${{ github.ref_name }}
+            type=gha,scope=${{ inputs.distribution }}-main
+          cache-to: type=gha,mode=max,scope=${{ steps.cache-keys.outputs.docker_key }}
+
       - name: Setup local kind cluster
         uses: helm/kind-action@v1
         with:

Makefile

@@ -18,7 +18,7 @@ GO_LICENCE_DETECTOR_CONFIG   := $(SRC_ROOT)/internal/assets/license/rules.json
 
 DISTRIBUTIONS ?= "nrdot-collector-host,nrdot-collector-k8s,nrdot-collector"
 
-ci: check build version-check licenses-check
+ci: check generate-sources version-check licenses-check
 check: ensure-goreleaser-up-to-date
 
 build: go ocb

distributions/nrdot-collector/.goreleaser-nightly.yaml

@@ -67,7 +67,7 @@ nfpms:
     formats:
       - deb
       - rpm
-    maintainer: New Relic <caos-team@newrelic.com>
+    maintainer: New Relic <otelcomm-team@newrelic.com>
     description: NRDOT Collector - nrdot-collector
     license: Apache 2.0
 snapshot:

distributions/nrdot-collector/.goreleaser.yaml

@@ -67,7 +67,7 @@ nfpms:
     formats:
       - deb
       - rpm
-    maintainer: New Relic <caos-team@newrelic.com>
+    maintainer: New Relic <otelcomm-team@newrelic.com>
     description: NRDOT Collector - nrdot-collector
     license: Apache 2.0
 snapshot: