From b63fca2dd7dba04882413fe3354a4988deeba9bf Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 27 Jul 2023 14:19:28 +0100 Subject: [PATCH] only build ARM AMD64 on develop --- .woodpecker/build-amd64.yml | 29 ++------------------------ .woodpecker/build-arm64.yml | 35 ++++---------------------------- docs/docs/installation/otp_en.md | 6 +++--- 3 files changed, 9 insertions(+), 61 deletions(-) diff --git a/.woodpecker/build-amd64.yml b/.woodpecker/build-amd64.yml index 3c445988b..b73d1b5d4 100644 --- a/.woodpecker/build-amd64.yml +++ b/.woodpecker/build-amd64.yml @@ -17,8 +17,6 @@ variables: branch: - develop - stable - - refs/tags/v* - - refs/tags/stable-* - &on-stable when: event: @@ -26,7 +24,6 @@ variables: - tag branch: - stable - - refs/tags/stable-* - &on-point-release when: event: @@ -104,7 +101,7 @@ pipeline: # Canonical amd64-musl musl: image: hexpm/elixir:1.14.3-erlang-25.2.2-alpine-3.18.0 - <<: *on-release + <<: *on-point-release environment: MIX_ENV: prod commands: @@ -119,31 +116,9 @@ pipeline: release-musl: image: akkoma/releaser - <<: *on-release + <<: *on-point-release secrets: *scw-secrets commands: - export SOURCE=akkoma-amd64-musl.zip - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-musl.zip - /bin/sh /entrypoint.sh - - docs: - <<: *on-point-release - secrets: - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID - environment: - CI: "true" - image: python:3.10-slim - commands: - - apt-get update && apt-get install -y rclone wget git zip - - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64 - - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli - - chmod +x scaleway-cli - - ./scaleway-cli object config install type=rclone - - cd docs - - pip install -r requirements.txt - - mkdocs build - - zip -r docs.zip site/* - - cd site - - rclone copy . scaleway:akkoma-docs/$CI_COMMIT_BRANCH/ diff --git a/.woodpecker/build-arm64.yml b/.woodpecker/build-arm64.yml index f45a91db0..ec1300cec 100644 --- a/.woodpecker/build-arm64.yml +++ b/.woodpecker/build-arm64.yml @@ -15,10 +15,7 @@ variables: - push - tag branch: - - develop - stable - - refs/tags/v* - - refs/tags/stable-* - &on-stable when: event: @@ -26,13 +23,11 @@ variables: - tag branch: - stable - - refs/tags/stable-* - &on-point-release when: event: - push branch: - - develop - stable - &on-pr-open when: @@ -75,7 +70,7 @@ pipeline: debian-bullseye: image: hexpm/elixir:1.14.3-erlang-25.2.2-debian-bullseye-20230109 - <<: *on-release + <<: *on-point-release environment: MIX_ENV: prod DEBIAN_FRONTEND: noninteractive @@ -92,7 +87,7 @@ pipeline: release-debian: image: akkoma/releaser:arm64 - <<: *on-release + <<: *on-point-release secrets: *scw-secrets commands: - export SOURCE=akkoma-arm64.zip @@ -104,7 +99,7 @@ pipeline: # Canonical arm64-musl musl: image: hexpm/elixir:1.14.3-erlang-25.2.2-alpine-3.18.0 - <<: *on-release + <<: *on-point-release environment: MIX_ENV: prod commands: @@ -119,31 +114,9 @@ pipeline: release-musl: image: akkoma/releaser:arm64 - <<: *on-release + <<: *on-point-release secrets: *scw-secrets commands: - export SOURCE=akkoma-arm64-musl.zip - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-musl.zip - /bin/sh /entrypoint.sh - - docs: - <<: *on-point-release - secrets: - - SCW_ACCESS_KEY - - SCW_SECRET_KEY - - SCW_DEFAULT_ORGANIZATION_ID - environment: - CI: "true" - image: python:3.10-slim - commands: - - apt-get update && apt-get install -y rclone wget git zip - - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_arm64 - - mv scaleway-cli_2.5.1_linux_arm64 scaleway-cli - - chmod +x scaleway-cli - - ./scaleway-cli object config install type=rclone - - cd docs - - pip install -r requirements.txt - - mkdocs build - - zip -r docs.zip site/* - - cd site - - rclone copy . scaleway:akkoma-docs/$CI_COMMIT_BRANCH/ diff --git a/docs/docs/installation/otp_en.md b/docs/docs/installation/otp_en.md index 2a9735f3c..4a87e17d5 100644 --- a/docs/docs/installation/otp_en.md +++ b/docs/docs/installation/otp_en.md @@ -22,11 +22,11 @@ Use the following mapping to figure out your flavour: | distribution | architecture | flavour | available branches | | --------------- | ------------------ | ------------------- | ------------------- | | debian bullseye | amd64 | amd64 | develop, stable | -| debian bullseye | arm64 | arm64 | develop, stable | +| debian bullseye | arm64 | arm64 | stable | | ubuntu focal | amd64 | amd64 | develop, stable | -| ubuntu focal | arm64 | arm64 | develop, stable | +| ubuntu focal | arm64 | arm64 | stable | | ubuntu jammy | amd64 | amd64-ubuntu-jammy | develop, stable | -| ubuntu jammy | arm64 | arm64-ubuntu-jammy | develop, stable | +| ubuntu jammy | arm64 | arm64-ubuntu-jammy | stable | | alpine | amd64 | amd64-musl | stable | | alpine | arm64 | arm64-musl | stable |