From 1be18a9f4cdfb722189c879f44335c4a8fa32be7 Mon Sep 17 00:00:00 2001 From: Floatingghost Date: Sun, 5 Jan 2025 16:37:54 +0000 Subject: [PATCH 1/3] update deprecated CI config --- .woodpecker/build-amd64.yml | 15 +++++++++------ .woodpecker/build-arm64.yml | 13 ++++++++----- .woodpecker/docs.yml | 4 ---- .woodpecker/lint.yml | 4 ---- .woodpecker/test.yml | 4 ---- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/.woodpecker/build-amd64.yml b/.woodpecker/build-amd64.yml index 32bbd2456..0a41fafef 100644 --- a/.woodpecker/build-amd64.yml +++ b/.woodpecker/build-amd64.yml @@ -6,9 +6,12 @@ depends_on: variables: - &scw-secrets - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID + SCW_ACCESS_KEY: + from_secret: SCW_ACCESS_KEY + SCW_SECRET_KEY: + from_secret: SCW_SECRET_KEY + SCW_DEFAULT_ORGANIZATION_ID: + from_secret: SCW_DEFAULT_ORGANIZATION_ID - &setup-hex "mix local.hex --force && mix local.rebar --force" - &on-release when: @@ -56,7 +59,7 @@ steps: release-debian-bookworm: image: akkoma/releaser <<: *on-release - secrets: *scw-secrets + environment: *scw-secrets commands: - export SOURCE=akkoma-amd64.zip # AMD64 @@ -85,7 +88,7 @@ steps: release-debian-bullseye: image: akkoma/releaser <<: *on-release - secrets: *scw-secrets + environment: *scw-secrets commands: - export SOURCE=akkoma-amd64-debian-bullseye.zip # AMD64 @@ -111,7 +114,7 @@ steps: release-musl: image: akkoma/releaser <<: *on-stable - secrets: *scw-secrets + environment: *scw-secrets commands: - export SOURCE=akkoma-amd64-musl.zip - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-musl.zip diff --git a/.woodpecker/build-arm64.yml b/.woodpecker/build-arm64.yml index 7bcdc1435..2ee94be3b 100644 --- a/.woodpecker/build-arm64.yml +++ b/.woodpecker/build-arm64.yml @@ -6,9 +6,12 @@ depends_on: variables: - &scw-secrets - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID + SCW_ACCESS_KEY: + from_secret: SCW_ACCESS_KEY + SCW_SECRET_KEY: + from_secret: SCW_SECRET_KEY + SCW_DEFAULT_ORGANIZATION_ID: + from_secret: SCW_DEFAULT_ORGANIZATION_ID - &setup-hex "mix local.hex --force && mix local.rebar --force" - &on-release when: @@ -56,7 +59,7 @@ steps: release-debian-bookworm: image: akkoma/releaser:arm64 <<: *on-release - secrets: *scw-secrets + environment: *scw-secrets commands: - export SOURCE=akkoma-arm64.zip - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-ubuntu-jammy.zip @@ -83,7 +86,7 @@ steps: release-musl: image: akkoma/releaser:arm64 <<: *on-stable - secrets: *scw-secrets + environment: *scw-secrets commands: - export SOURCE=akkoma-arm64-musl.zip - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-musl.zip diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index be7444e28..c550c3022 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -6,10 +6,6 @@ depends_on: - build-amd64 variables: - - &scw-secrets - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID - &setup-hex "mix local.hex --force && mix local.rebar --force" - &on-release when: diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index 623494301..70e8fc95d 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -2,10 +2,6 @@ labels: platform: linux/amd64 variables: - - &scw-secrets - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID - &setup-hex "mix local.hex --force && mix local.rebar --force" - &on-release when: diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 45cf7f93d..bef503752 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -17,10 +17,6 @@ matrix: OTP_VERSION: 26 variables: - - &scw-secrets - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID - &setup-hex "mix local.hex --force && mix local.rebar --force" - &on-release when: From a846e60d718ff14dcd7a80e8b7b5e20caca96eee Mon Sep 17 00:00:00 2001 From: Floatingghost Date: Sun, 5 Jan 2025 16:39:30 +0000 Subject: [PATCH 2/3] and the docs one --- .woodpecker/docs.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index c550c3022..f8cd12145 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -45,12 +45,14 @@ variables: steps: docs: <<: *on-point-release - secrets: - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID environment: CI: "true" + SCW_ACCESS_KEY: + from_secret: SCW_ACCESS_KEY + SCW_SECRET_KEY: + from_secret: SCW_SECRET_KEY + SCW_DEFAULT_ORGANIZATION_ID: + from_secret: SCW_DEFAULT_ORGANIZATION_ID image: python:3.10-slim commands: - apt-get update && apt-get install -y rclone wget git zip From 054396a99ed81fd659f4394e3bfa7fab17382773 Mon Sep 17 00:00:00 2001 From: Floatingghost Date: Sun, 5 Jan 2025 17:23:52 +0000 Subject: [PATCH 3/3] ARM64 --- .woodpecker/build-arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-arm64.yml b/.woodpecker/build-arm64.yml index 2ee94be3b..b1e495153 100644 --- a/.woodpecker/build-arm64.yml +++ b/.woodpecker/build-arm64.yml @@ -1,5 +1,5 @@ labels: - platform: linux/aarch64 + platform: linux/arm64 depends_on: - test