From 78286276cc1ea5b2790a1d9057900626e6d87fd3 Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Wed, 4 Sep 2024 16:45:10 +0200
Subject: [PATCH] resume normal builds

---
 .woodpecker/build.yaml | 86 +++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index dfe1cc0..4361e7c 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -3,16 +3,16 @@ when:
 
 matrix:
   include:
-    # - PLATFORM: rhel-9
-    #   PLATFORM_ID: el9
-    # - PLATFORM: centos-8
-    #   PLATFORM_ID: el8
-    # - PLATFORM: ubuntu-2204
-    #   PLATFORM_ID: 2204
-    # - PLATFORM: ubuntu-2404
-    #   PLATFORM_ID: 2404
-    # - PLATFORM: opensuse-155
-    #   PLATFORM_ID: suse155
+    - PLATFORM: rhel-9
+      PLATFORM_ID: el9
+    - PLATFORM: centos-8
+      PLATFORM_ID: el8
+    - PLATFORM: ubuntu-2204
+      PLATFORM_ID: 2204
+    - PLATFORM: ubuntu-2404
+      PLATFORM_ID: 2404
+    - PLATFORM: opensuse-155
+      PLATFORM_ID: suse155
     - PLATFORM: alpine-320
       PLATFORM_ID: alpine320
 
@@ -52,11 +52,11 @@ steps:
   - name: Check if files for R version already exist in s3
     environment:
       AWS_ACCESS_KEY_ID:
-        from_secret: b2_application_key
-      AWS_SECRET_ACCESS_KEY:
         from_secret: b2_application_key_id
-      AWS_REGION: eu-central-2
-      AWS_ENDPOINT: s3.eu-central-003.backblazeb2.com
+      AWS_SECRET_ACCESS_KEY:
+        from_secret: b2_application_key
+      # AWS_REGION: s3.eu-central-003
+      AWS_ENDPOINT_URL: https://s3.eu-central-003.backblazeb2.com
     image: alpine:3.20
     commands:
       - apk add -q --no-cache aws-cli
@@ -68,35 +68,35 @@ steps:
           topology.kubernetes.io/region: fsn1
 
   # ref: https://github.com/woodpecker-ci/woodpecker/discussions/2721
-  # - name: Build
-  #   image: alpine:3.20
-  #   privileged: true
-  #   environment:
-  #     DOCKER_HOST: tcp://docker:2375
-  #   commands: |
-  #     # docker info
-  #     if [ ! -s r_build_latest.txt ] || [ ! "$(cat r-release-version.txt)" = "$(cat r_build_latest.txt)" ]; then
-  #       apk add -q --no-cache py3-pip make just aws-cli docker-compose
-  #       pip3 install -q b2 --break-system-packages
-  #       just build-r-${PLATFORM} $(cat r-release-version.txt)
-  #     fi
-  #   backend_options:
-  #     kubernetes:
-  #       resources:
-  #         requests:
-  #           memory: 200Mi
-  #           cpu: 500m
-  #         limits:
-  #           memory: 1000Mi
-  #           cpu: 4000m
-  #       nodeSelector:
-  #         kubernetes.io/arch: "arm64"
-  #         topology.kubernetes.io/region: fsn1
-  #       tolerations:
-  #         - key: "CI"
-  #           operator: "Equal"
-  #           value: "true"
-  #           effect: "NoSchedule"
+  - name: Build
+    image: alpine:3.20
+    privileged: true
+    environment:
+      DOCKER_HOST: tcp://docker:2375
+    commands: |
+      # docker info
+      if [ ! -s r_build_latest.txt ] || [ ! "$(cat r-release-version.txt)" = "$(cat r_build_latest.txt)" ]; then
+        apk add -q --no-cache py3-pip make just aws-cli docker-compose
+        pip3 install -q b2 --break-system-packages
+        just build-r-${PLATFORM} $(cat r-release-version.txt)
+      fi
+    backend_options:
+      kubernetes:
+        resources:
+          requests:
+            memory: 200Mi
+            cpu: 500m
+          limits:
+            memory: 1000Mi
+            cpu: 4000m
+        nodeSelector:
+          kubernetes.io/arch: "arm64"
+          topology.kubernetes.io/region: fsn1
+        tolerations:
+          - key: "CI"
+            operator: "Equal"
+            value: "true"
+            effect: "NoSchedule"
 
   - name: Upload
     image: woodpeckerci/plugin-s3:1.3.0