test build platform

.github/workflows/pr.yml

@@ -10,41 +10,19 @@ name: PR Build
 permissions:
     contents: read
 jobs:
-  build-amd64:
+  test-amd64:
     runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }},image=ubuntu22-full-x64,hdd=64
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Install Dapper
+    - name: Setup QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: test build image
       run: |
-        curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper
-        chmod +x /usr/local/bin/dapper
-    - name: Build
-      run: dapper -f Dockerfile --target dapper make dapper-ci
-    - name: Test
-      run: dapper -f Dockerfile --target dapper make test
-    - name: Prepare Test Logs on Failure
-      if: ${{ failure() }}
-      run: |
-        sudo cp -r /tmp/rke2-logs ~/rke2-logs
-        sudo chown -R $USER:$USER ~/rke2-logs
-        ls -la ~/rke2-logs
-    - name: Upload Logs on Failure
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: rke2-test-logs
-        path: ~/rke2-logs/
-  build-arm64:
-    runs-on: runs-on,runner=8cpu-linux-arm64,run-id=${{ github.run_id }},image=ubuntu22-full-arm64,hdd=64
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Install Dapper
-      run: |
-        curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper
-        chmod +x /usr/local/bin/dapper
-    - name: Build
-      run: |
-        dapper -f Dockerfile --target dapper make dapper-ci
-
+        export GOARCH=amd64
+        export GOOS=linux
+        export IID_FILE=$(mktemp)
+        export IID_FILE_FLAG="--iidfile ${IID_FILE}"
+        make test-publish-image-runtime-windows

Dockerfile.windows

@@ -1,4 +1,4 @@
-FROM alpine:3.20 AS build
+FROM --platform=$BUILDPLATFORM alpine:3.20 AS build
 
 RUN apk --no-cache add \
     curl \
@@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins
 WORKDIR /source
 # End Dapper stuff
 
-FROM rancher/hardened-containerd:v1.7.22-k3s1-build20241010-amd64-windows AS containerd
+FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.22-k3s1-build20241010-amd64-windows AS containerd
 FROM build as windows-runtime-collect
 ARG KUBERNETES_VERSION=dev
 

Makefile

@@ -55,8 +55,8 @@ build-image-runtime:                      ## Build the runtime image
 publish-image-runtime:
 	./scripts/publish-image-runtime
 
-.PHONY: publish-image-runtime-windows
-publish-image-runtime-windows:
+.PHONY: test-publish-image-runtime-windows
+test-publish-image-runtime-windows:
 	./scripts/publish-image-runtime-windows
 
 .PHONY: validate

scripts/publish-image-runtime-windows

@@ -16,5 +16,5 @@ docker buildx build ${IID_FILE_FLAG} \
     --tag ${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-windows-amd64 \
     --target windows-runtime \
     --file Dockerfile.windows \
-    --push \
+    --platform windows/amd64 \
     .