Skip to content

Commit c17bf8d

Browse files
committed
Enable CI on ubuntu-24.04-riscv
Signed-off-by: Ludovic Henry <git@ludovic.dev>
1 parent 74ff9da commit c17bf8d

4 files changed

Lines changed: 29 additions & 4 deletions

File tree

.github/workflows/build-k0s.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
description: The architecture to build k0s for.
1414

1515
env:
16-
MAKEFLAGS: -j
16+
MAKEFLAGS: -j --output-sync=line
1717

1818
jobs:
1919
build:
@@ -22,6 +22,7 @@ jobs:
2222
${{
2323
inputs.target-arch == 'arm' && fromJSON('["self-hosted", "linux", "arm"]')
2424
|| inputs.target-arch == 'arm64' && 'ubuntu-24.04-arm'
25+
|| inputs.target-arch == 'riscv64' && 'ubuntu-24.04-riscv'
2526
|| 'ubuntu-24.04'
2627
}}
2728
@@ -103,9 +104,11 @@ jobs:
103104
k0s${{ steps.build-prepare.outputs.executable-suffix }}
104105
105106
- name: "Build :: SBOM"
107+
if: inputs.target-arch != 'riscv64' # FIXME: https://github.com/anchore/syft/pull/4757, it doesn't support linux-riscv64 yet
106108
run: make spdx.json
107109

108110
- name: "Upload :: SBOM"
111+
if: inputs.target-arch != 'riscv64' # FIXME: https://github.com/anchore/syft/pull/4757, it doesn't support linux-riscv64 yet
109112
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
110113
with:
111114
name: sbom-${{ inputs.target-os }}-${{ inputs.target-arch }}

.github/workflows/go.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ jobs:
100100
target-arch: amd64
101101
- target-os: linux
102102
target-arch: arm64
103+
- target-os: linux
104+
target-arch: riscv64
103105
- target-os: windows
104106
target-arch: amd64
105107

@@ -113,7 +115,7 @@ jobs:
113115
strategy:
114116
fail-fast: false
115117
matrix:
116-
target-arch: [amd64, arm64]
118+
target-arch: [amd64, arm64, riscv64]
117119

118120
name: "Build :: Airgap image bundle"
119121
needs: [build-k0s]
@@ -161,6 +163,8 @@ jobs:
161163
include:
162164
- name: linux-amd64
163165
runs-on: ubuntu-24.04
166+
- name: linux-riscv64
167+
runs-on: ubuntu-24.04-riscv
164168
- name: windows-amd64
165169
runs-on: windows-2022
166170
target-os: windows
@@ -269,6 +273,24 @@ jobs:
269273
arch: arm64
270274
name: ${{ matrix.smoke-suite }}
271275

276+
smoketests-linux-riscv64:
277+
strategy:
278+
fail-fast: false
279+
matrix:
280+
smoke-suite:
281+
- airgap
282+
- basic
283+
- network-conformance-calico
284+
- network-conformance-kuberouter
285+
286+
name: "check-${{ matrix.smoke-suite }} :: riscv64"
287+
needs: [build-k0s, build-airgap-image-bundle]
288+
289+
uses: ./.github/workflows/smoketest.yaml
290+
with:
291+
arch: riscv64
292+
name: ${{ matrix.smoke-suite }}
293+
272294
autopilot-tests:
273295
strategy:
274296
fail-fast: false

.github/workflows/smoketest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ permissions:
2626
jobs:
2727
smoketest:
2828
name: Test
29-
runs-on: ${{ inputs.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
29+
runs-on: ${{ (inputs.arch == 'arm64' && 'ubuntu-24.04-arm') || (inputs.arch == 'riscv64' && 'ubuntu-24.04-riscv') || 'ubuntu-24.04' }}
3030
steps:
3131
- name: Check out code into the Go module directory
3232
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1

inttest/bootloose-alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM docker.io/library/alpine:$ALPINE_VERSION
66
ARG TARGETARCH
77
ARG CRI_DOCKERD_VERSION=0.4.2 # renovate: datasource=github-releases depName=Mirantis/cri-dockerd
88
ARG ETCD_VERSION
9-
ARG TROUBLESHOOT_VERSION=0.126.1 # renovate: datasource=github-releases depName=replicatedhq/troubleshoot
9+
ARG TROUBLESHOOT_VERSION=0.127.0 # renovate: datasource=github-releases depName=replicatedhq/troubleshoot
1010
ARG HELM_VERSION
1111

1212
# Apply our changes to the image

0 commit comments

Comments
 (0)