feat: Update goreleaser

newrelic · Jan 9, 2025 · af43351 · af43351
1 parent 6fa9ac5
commit af43351
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/ci-prerelease.yml b/.github/workflows/ci-prerelease.yml
@@ -40,10 +40,10 @@ jobs:
           password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }}
 
       - name: Build binaries & packages with GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: '~> v1'
+          version: '~> v2'
           args: release --rm-dist --timeout 2h
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci-prerelease_linux_on_demand.yml b/.github/workflows/ci-prerelease_linux_on_demand.yml
@@ -80,10 +80,10 @@ jobs:
           password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }}
 
       - name: Build binaries & packages with GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: '~> v1'
+          version: '~> v2'
           args: release --rm-dist --skip-docker --skip-publish --timeout 2h
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -40,10 +40,10 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: Build binaries & packages with GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: '~> v1'
+          version: '~> v2'
           args: --snapshot --clean --skip-sign --timeout 2h
 
       - name: Extract image version

diff --git a/.github/workflows/ci_nightly.yaml b/.github/workflows/ci_nightly.yaml
@@ -39,11 +39,11 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: Build binaries & packages with GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: '~> v1'
-          args: --snapshot --clean --skip-sign --timeout 2h
+          version: '~> v2'
+          args: --snapshot --clean --skip=sign --timeout 2h
 
       - name: Extract image version
         run: echo "version=$(jq -r '.version' dist/metadata.json)" >> $GITHUB_ENV

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,3 +1,4 @@
+version: 2
 project_name: opentelemetry-collector-releases
 builds:
   - id: nr-otel-collector
@@ -157,4 +158,4 @@ checksum:
 
 # Skip auto-generating changelog.
 changelog:
-  skip: true
+  disable: true
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -50,12 +50,14 @@ container_path_ocb_config="${container_work_dir}/${ocb_config}"
 
 echo "Building: $distribution"
 docker run \
+  --name ocb \
   -v "$(pwd)/${ocb_config}:${container_path_ocb_config}" \
-  -v "$(pwd)/${output_dir}:${container_work_dir}/${output_dir}:rw" \
   "${builder_image}" \
   --config "${container_path_ocb_config}" \
   --skip-compilation=${skipcompilation}
 
+docker cp "ocb:${container_work_dir}/${output_dir}/." "${output_dir}"
+
 if [[ "$ensure_docker_write_permissions" == "true" ]]; then
     # change owner of output dir back to the 'build' user to allow access for following steps
     sudo chown -R $(id -u):$(id -g) "${output_dir}"