feat: add riscv64 arch

shanduur · shanduur · commit 449cbb50f087 · 2025-06-03T09:52:12.000+02:00
Signed-off-by: Mateusz Urbanek &lt;mateusz.urbanek.98@gmail.com&gt;
diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml
@@ -55,6 +55,10 @@ jobs:
             GOARCH: ppc64le
           - GOOS: windows
             GOARCH: ppc64le
+          - GOOS: darwin
+            GOARCH: riscv64
+          - GOOS: windows
+            GOARCH: riscv64
     runs-on: ubuntu-24.04
     outputs:
       version: ${{ steps.prep.outputs.version }}
@@ -68,7 +72,7 @@ jobs:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
-          platforms: arm64,ppc64le,linux/arm/v7,s390x
+          platforms: arm64,ppc64le,linux/arm/v7,s390x,riscv64
 
       - name: Setup wixl # Required to build MSI packages for Windows
         if: ${{ matrix.GOOS == 'windows' && ( matrix.GOARCH == '386' || matrix.GOARCH == 'amd64') }}
@@ -268,7 +272,7 @@ jobs:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
-          platforms: arm64,ppc64le,linux/arm/v7,s390x
+          platforms: arm64,ppc64le,linux/arm/v7,s390x,riscv64
 
       - name: Download container image artifact
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml
@@ -50,7 +50,7 @@ jobs:
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         if: runner.os != 'Windows'
         with:
-          platforms: arm64,ppc64le,linux/arm/v7,s390x
+          platforms: arm64,ppc64le,linux/arm/v7,s390x,riscv64
 
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
         if: runner.os != 'Windows'
@@ -162,7 +162,7 @@ jobs:
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         if: runner.os != 'Windows'
         with:
-          platforms: arm64,ppc64le,s390x
+          platforms: arm64,ppc64le,s390x,riscv64
 
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
         if: runner.os != 'Windows'
diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml
@@ -11,7 +11,7 @@ env:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
-    
+
     permissions:
       id-token: write
       packages: write
@@ -43,7 +43,7 @@ jobs:
       - uses: anchore/sbom-action/download-syft@e11c554f704a0b820cbf8c51673f6945e0731532 # v0.20.0
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
-          platforms: amd64, arm64,ppc64le
+          platforms: amd64,arm64,ppc64le,riscv64
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Setup Go
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml
@@ -1,7 +1,7 @@
 name: CI - Builder
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -47,7 +47,7 @@ jobs:
       - uses: anchore/sbom-action/download-syft@e11c554f704a0b820cbf8c51673f6945e0731532 # v0.20.0
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
-          platforms: amd64, arm64,ppc64le
+          platforms: amd64,arm64,ppc64le,riscv64
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Setup Go
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
diff --git a/.github/workflows/ci-goreleaser-contrib.yaml b/.github/workflows/ci-goreleaser-contrib.yaml
@@ -1,7 +1,7 @@
 name: CI - Contrib - GoReleaser
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -30,7 +30,7 @@ jobs:
     with:
       distribution: otelcol-contrib
       goos: '[ "linux", "windows", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
+      goarch: '[ "386", "amd64", "arm", "arm64", "ppc64le", "riscv64", "s390x" ]'
     secrets: inherit
 
   package-tests:
diff --git a/.github/workflows/ci-goreleaser-core.yaml b/.github/workflows/ci-goreleaser-core.yaml
@@ -1,7 +1,7 @@
 name: CI - Core - GoReleaser
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -30,7 +30,7 @@ jobs:
     with:
       distribution: otelcol
       goos: '[ "linux", "windows", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
+      goarch: '[ "386", "amd64", "arm", "arm64", "ppc64le", "riscv64", "s390x" ]'
     secrets: inherit
 
   package-tests:
diff --git a/.github/workflows/ci-goreleaser-k8s.yaml b/.github/workflows/ci-goreleaser-k8s.yaml
@@ -1,7 +1,7 @@
 name: CI - k8s - GoReleaser
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -30,5 +30,5 @@ jobs:
     with:
       distribution: otelcol-k8s
       goos: '[ "linux" ]'
-      goarch: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
+      goarch: '[ "amd64", "arm64", "ppc64le", "riscv64", "s390x" ]'
     secrets: inherit
diff --git a/.github/workflows/ci-goreleaser-otlp.yaml b/.github/workflows/ci-goreleaser-otlp.yaml
@@ -1,7 +1,7 @@
 name: CI - OTLP - GoReleaser
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -30,5 +30,5 @@ jobs:
     with:
       distribution: otelcol-otlp
       goos: '[ "linux", "windows", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
+      goarch: '[ "386", "amd64", "arm", "arm64", "ppc64le", "riscv64", "s390x" ]'
     secrets: inherit
diff --git a/.github/workflows/opampsupervisor-release.yaml b/.github/workflows/opampsupervisor-release.yaml
@@ -11,7 +11,7 @@ env:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
-    
+
     permissions:
       id-token: write
       packages: write
@@ -43,7 +43,7 @@ jobs:
       - uses: anchore/sbom-action/download-syft@e11c554f704a0b820cbf8c51673f6945e0731532 # v0.20.0
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
-          platforms: amd64, arm64,ppc64le
+          platforms: amd64,arm64,ppc64le,riscv64
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Setup Go
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
diff --git a/.github/workflows/opampsupervisor-testbuild.yaml b/.github/workflows/opampsupervisor-testbuild.yaml
@@ -1,7 +1,7 @@
 name: CI - OpAMP supervisor
 
 on:
-  merge_group: 
+  merge_group:
   push:
     branches: [main]
     paths:
@@ -45,7 +45,7 @@ jobs:
       - uses: anchore/sbom-action/download-syft@e11c554f704a0b820cbf8c51673f6945e0731532 # v0.20.0
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
-          platforms: amd64, arm64,ppc64le
+          platforms: amd64, arm64,ppc64le,riscv64
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Setup Go
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
diff --git a/.github/workflows/release-contrib.yaml b/.github/workflows/release-contrib.yaml
@@ -11,7 +11,7 @@ jobs:
     with:
       distribution: otelcol-contrib
       goos: '[ "linux", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
+      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x", "riscv64" ]'
     secrets: inherit
     permissions: write-all
   release-windows:
diff --git a/.github/workflows/release-core.yaml b/.github/workflows/release-core.yaml
@@ -11,7 +11,7 @@ jobs:
     with:
       distribution: otelcol
       goos: '[ "linux", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
+      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x", "riscv64" ]'
     secrets: inherit
     permissions: write-all
   release-windows:
diff --git a/.github/workflows/release-otlp.yaml b/.github/workflows/release-otlp.yaml
@@ -11,7 +11,7 @@ jobs:
     with:
       distribution: otelcol-otlp
       goos: '[ "linux", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
+      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x", "riscv64" ]'
     secrets: inherit
     permissions: write-all
   release-windows:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -99,7 +99,7 @@ make goreleaser-verify
 
 ## Building Multi-Architecture Docker Images
 
-`goreleaser` will build Docker images for various architectures, including `x86_64`, `386`, `arm`, `arm64`, and `ppc64le`. The build process involves executing `RUN` steps on the target architecture, which means the system you run it on needs support for emulating foreign architectures.
+`goreleaser` will build Docker images for various architectures, including `x86_64`, `386`, `arm`, `arm64`, `ppc64le`, and `riscv64`. The build process involves executing `RUN` steps on the target architecture, which means the system you run it on needs support for emulating foreign architectures.
 
 To set up the environment for building multi-architecture images:
 
diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml
@@ -17,13 +17,18 @@ builds:
       - amd64
       - arm64
       - ppc64le
+      - riscv64
     ignore:
       - goos: windows
         goarch: arm64
       - goos: windows
         goarch: ppc64le
       - goos: darwin
         goarch: ppc64le
+      - goos: windows
+        goarch: riscv64
+      - goos: darwin
+        goarch: riscv64
     binary: ocb
 dockers:
   - goos: linux
@@ -139,4 +144,4 @@ sboms:
     artifacts: archive
   - id: package
     artifacts: package
-    
+
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -35,18 +35,18 @@ const (
 	k8sDistro          = "otelcol-k8s"
 	otlpDistro         = "otelcol-otlp"
 	ebpfProfilerDistro = "otelcol-ebpf-profiler"
-	dockerHub        = "otel"
-	ghcr             = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
-	binaryNamePrefix = "otelcol"
-	imageNamePrefix  = "opentelemetry-collector"
+	dockerHub          = "otel"
+	ghcr               = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
+	binaryNamePrefix   = "otelcol"
+	imageNamePrefix    = "opentelemetry-collector"
 )
 
 var (
-	baseArchs         = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
+	baseArchs         = []string{"386", "amd64", "arm", "arm64", "ppc64le", "riscv64", "s390x"}
 	winArchs          = []string{"386", "amd64", "arm64"}
 	winContainerArchs = []string{"amd64"}
 	darwinArchs       = []string{"amd64", "arm64"}
-	k8sArchs          = []string{"amd64", "arm64", "ppc64le", "s390x"}
+	k8sArchs          = []string{"amd64", "arm64", "ppc64le", "riscv64", "s390x"}
 	ebpfProfilerArchs = []string{"amd64"}
 
 	imageRepos = []string{dockerHub, ghcr}
diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml
@@ -17,6 +17,7 @@ builds:
       - arm
       - arm64
       - ppc64le
+      - riscv64
       - s390x
     goarm:
       - "7"
diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -24,6 +24,7 @@ builds:
       - arm
       - arm64
       - ppc64le
+      - riscv64
       - s390x
     goarm:
       - "7"
@@ -204,6 +205,26 @@ dockers:
       - --label=org.opencontainers.image.source={{.GitURL}}
       - --label=org.opencontainers.image.licenses=Apache-2.0
     use: buildx
+  - goos: linux
+    goarch: riscv64
+    dockerfile: Dockerfile
+    image_templates:
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-riscv64
+      - otel/opentelemetry-collector-contrib:latest-riscv64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-riscv64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-riscv64
+    extra_files:
+      - config.yaml
+    build_flag_templates:
+      - --pull
+      - --platform=linux/riscv64
+      - --label=org.opencontainers.image.created={{.Date}}
+      - --label=org.opencontainers.image.name={{.ProjectName}}
+      - --label=org.opencontainers.image.revision={{.FullCommit}}
+      - --label=org.opencontainers.image.version={{.Version}}
+      - --label=org.opencontainers.image.source={{.GitURL}}
+      - --label=org.opencontainers.image.licenses=Apache-2.0
+    use: buildx
   - goos: linux
     goarch: s390x
     dockerfile: Dockerfile
@@ -278,6 +299,7 @@ docker_manifests:
       - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
       - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
       - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-riscv64
       - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
   - name_template: otel/opentelemetry-collector-contrib:latest
     image_templates:
@@ -286,6 +308,7 @@ docker_manifests:
       - otel/opentelemetry-collector-contrib:latest-armv7
       - otel/opentelemetry-collector-contrib:latest-arm64
       - otel/opentelemetry-collector-contrib:latest-ppc64le
+      - otel/opentelemetry-collector-contrib:latest-riscv64
       - otel/opentelemetry-collector-contrib:latest-s390x
   - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
     image_templates:
@@ -294,6 +317,7 @@ docker_manifests:
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-riscv64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
   - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
     image_templates:
@@ -302,6 +326,7 @@ docker_manifests:
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-riscv64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
 signs:
   - cmd: cosign
diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml
diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml
diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml
