From f9318439ed51da5d59f6e73b5a8f3bcc0349e0d6 Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Fri, 6 Dec 2024 12:02:00 +0100
Subject: [PATCH] chore: don't set aws region

---
 .woodpecker/build.yaml     | 22 +++++++++++++++++-----
 Makefile                   |  2 +-
 builder/docker-compose.yml | 12 ++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index d1d3283..d4934da 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -43,9 +43,6 @@ matrix:
       ARCH: amd64
       ARCH_ID: amd64
       INSTANCE_TYPE: AX42
-    # - PLATFORM: opensuse-155
-    #   PLATFORM_ID: suse155
-    #   ARCH: arm64
     - PLATFORM: alpine-320
       PLATFORM_ID: alpine320
       ARCH: arm64
@@ -100,6 +97,11 @@ steps:
         nodeSelector:
           kubernetes.io/arch: "${ARCH}"
           node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
+        tolerations:
+          - key: "CI"
+            operator: "Equal"
+            value: "true"
+            effect: "NoSchedule"
 
   - name: Check if files for R version already exist in s3
     environment:
@@ -107,8 +109,8 @@ steps:
         from_secret: B2_APPLICATION_KEY_ID
       AWS_SECRET_ACCESS_KEY:
         from_secret: B2_APPLICATION_KEY
-      AWS_REGION: s3.eu-central-003
-      AWS_ENDPOINT: s3.eu-central-003.backblazeb2.com
+      # AWS_REGION: s3.eu-central-003
+      AWS_ENDPOINT_URL: https://s3.eu-central-003.backblazeb2.com
     image: alpine:3.21
     commands:
       - apk add -q --no-cache aws-cli
@@ -119,6 +121,11 @@ steps:
         nodeSelector:
           kubernetes.io/arch: "${ARCH}"
           node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
+        tolerations:
+          - key: "CI"
+            operator: "Equal"
+            value: "true"
+            effect: "NoSchedule"
 
   # ref: https://github.com/woodpecker-ci/woodpecker/discussions/2721
   - name: Build
@@ -213,6 +220,11 @@ steps:
         nodeSelector:
           kubernetes.io/arch: "${ARCH}"
           node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
+        tolerations:
+          - key: "CI"
+            operator: "Equal"
+            value: "true"
+            effect: "NoSchedule"
 
 services:
   docker:
diff --git a/Makefile b/Makefile
index d73308d..9e53e6a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 fedora-38 fedora-39 fedora-40 alpine-320
+PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 fedora-38 fedora-39 fedora-40 alpine-320 alpine-321
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js
 
 deps:
diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
index dfeab28..53b5396 100644
--- a/builder/docker-compose.yml
+++ b/builder/docker-compose.yml
@@ -47,6 +47,18 @@ services:
     image: r-builds:alpine-320
     volumes:
       - /tmp/alpine-320:/tmp/output/alpine-320
+  alpine-321:
+    command: ./build.sh
+    environment:
+      - R_VERSION=${R_VERSION}
+      - R_INSTALL_PATH=${R_INSTALL_PATH}
+      - LOCAL_STORE=/tmp/output
+    build:
+      context: .
+      dockerfile: Dockerfile.alpine-321
+    image: r-builds:alpine-321
+    volumes:
+      - /tmp/alpine-320:/tmp/output/alpine-320
   debian-10:
     command: ./build.sh
     environment: