Page MenuHomePhorge
Files F85828555

No OneTemporary
Actions

Authored By
Unknown
Size
9 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.woodpecker/docker-combine.yaml b/.woodpecker/docker-combine.yaml
new file mode 100644
index 000000000..46401b0cb
--- /dev/null
+++ b/.woodpecker/docker-combine.yaml
@@ -0,0 +1,65 @@
+when:
+ - event: push
+ branch: ${CI_REPO_DEFAULT_BRANCH}
+ path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
+ - event: push
+ branch: stable
+ path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
+ - event: tag
+ branch: stable
+ - event: manual
+ branch: stable
+
+depends_on:
+ - docker
+
+skip_clone: true
+
+steps:
+ docker-develop-combine:
+ image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
+ when:
+ - event: push
+ branch: ${CI_REPO_DEFAULT_BRANCH}
+ settings:
+ registry: "git.pleroma.social"
+ image: "pleroma/pleroma"
+ architectures: [amd64, arm64]
+ tags:
+ - latest
+ - develop
+ - ${CI_COMMIT_SHA}
+ username:
+ from_secret: pleroma-ci-user
+ password:
+ from_secret: pleroma-ci-password
+
+ docker-stable-combine:
+ image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
+ when:
+ - event: push
+ branch: stable
+ - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
+ settings: &docker_settings
+ registry: "git.pleroma.social"
+ image: "pleroma/pleroma"
+ architectures: [amd64, arm64]
+ tags: &docker_tags
+ - latest
+ - stable
+ - ${CI_COMMIT_SHA}
+ username:
+ from_secret: pleroma-ci-user
+ password:
+ from_secret: pleroma-ci-password
+
+ docker-stable-tag-combine:
+ image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
+ when:
+ - event: tag
+ - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
+ settings:
+ <<: *docker_settings
+ tags:
+ - <<: *docker_tags
+ - ${CI_COMMIT_TAG}
diff --git a/.woodpecker/docker-develop-combine.yaml b/.woodpecker/docker-develop-combine.yaml
deleted file mode 100644
index ebe5a502c..000000000
--- a/.woodpecker/docker-develop-combine.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-when:
- - event: push
- branch: ${CI_REPO_DEFAULT_BRANCH}
- path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
-
-depends_on:
- - docker-develop
-
-skip_clone: true
-
-steps:
- docker-develop-combine:
- image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
- settings:
- registry: "git.fluffytail.org"
- image: "pleroma-test/pleroma"
- architectures: [amd64, arm64]
- tags:
- - latest
- - develop
- - ${CI_COMMIT_SHA}
- username:
- from_secret: pleroma-ci-user
- password:
- from_secret: pleroma-ci-password
diff --git a/.woodpecker/docker-develop.yaml b/.woodpecker/docker-develop.yaml
deleted file mode 100644
index 4f6bbdf12..000000000
--- a/.woodpecker/docker-develop.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-when:
- - event: push
- branch: ${CI_REPO_DEFAULT_BRANCH}
- path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
-
-matrix:
- platform:
- - linux/amd64
- - linux/arm64
-
-# This is needed for the when clauses below.
-# When the platform clause is fixed, this might not be needed anymore
-labels:
- platform: ${platform}
-
-variables:
- docker_variables: &docker_variables
- repo: pleroma/pleroma
- registry: git.pleroma.social
- username:
- from_secret: pleroma-ci-user
- password:
- from_secret: pleroma-ci-password
-
-steps:
- docker-develop-amd64:
- image: woodpeckerci/plugin-kaniko:2.3.1
- # when:
- # - platform: linux/amd64
- # does not work even though it should according to docs
- # https://github.com/woodpecker-ci/woodpecker/discussions/5367#discussioncomment-13901342
- when:
- - evaluate: platform == "linux/amd64"
- settings:
- <<: *docker_variables
- tags:
- - latest-amd64
- - develop-amd64
- - ${CI_COMMIT_SHA}-amd64
-
- docker-develop-arm64:
- image: woodpeckerci/plugin-kaniko:2.3.1
- when:
- - evaluate: platform == "linux/arm64"
- settings:
- <<: *docker_variables
- tags:
- - latest-arm64
- - develop-arm64
- - ${CI_COMMIT_SHA}-arm64
diff --git a/.woodpecker/docker-stable-combine.yaml b/.woodpecker/docker-stable-combine.yaml
deleted file mode 100644
index 9f144d3f6..000000000
--- a/.woodpecker/docker-stable-combine.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-when:
- - event: push
- branch: stable
- path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
- - event: tag
- branch: stable
- - event: manual
- branch: stable
-
-depends_on:
- - docker-stable
-
-skip_clone: true
-
-steps:
- docker-stable-combine:
- image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
- when:
- - event: push
- - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_TAG == ""'
- settings: &docker_settings
- registry: "git.fluffytail.org"
- image: "pleroma-test/pleroma"
- architectures: [amd64, arm64]
- tags: &docker_tags
- - latest
- - stable
- - ${CI_COMMIT_SHA}
- username:
- from_secret: pleroma-ci-user
- password:
- from_secret: pleroma-ci-password
-
- docker-stable-tag-combine:
- image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
- when:
- - event: tag
- - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_TAG != ""'
- settings:
- <<: *docker_settings
- tags:
- - <<: *docker_tags
- - ${CI_COMMIT_TAG}
diff --git a/.woodpecker/docker-stable.yaml b/.woodpecker/docker.yaml
similarity index 58%
rename from .woodpecker/docker-stable.yaml
rename to .woodpecker/docker.yaml
index bd32b94d1..c1299b4fe 100644
--- a/.woodpecker/docker-stable.yaml
+++ b/.woodpecker/docker.yaml
@@ -1,79 +1,99 @@
when:
+ - event: push
+ branch: ${CI_REPO_DEFAULT_BRANCH}
+ path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
- event: push
branch: stable
path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
- event: tag
branch: stable
- event: manual
branch: stable
matrix:
platform:
- linux/amd64
- linux/arm64
# This is needed for the when clauses below.
-# When the platform clause is fixed, this might not be needed anymore
labels:
platform: ${platform}
variables:
docker_variables: &docker_variables
- repo: pleroma-test/pleroma
- registry: git.fluffytail.org
+ repo: pleroma/pleroma
+ registry: git.pleroma.social
username:
from_secret: pleroma-ci-user
password:
from_secret: pleroma-ci-password
kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.3.1
steps:
+ docker-develop-amd64:
+ image: woodpeckerci/plugin-kaniko:2.3.1
+ when:
+ - evaluate: 'platform == "linux/amd64" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
+ settings:
+ <<: *docker_variables
+ tags:
+ - latest-amd64
+ - develop-amd64
+ - ${CI_COMMIT_SHA}-amd64
+
+ docker-develop-arm64:
+ image: woodpeckerci/plugin-kaniko:2.3.1
+ when:
+ - evaluate: 'platform == "linux/arm64" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
+ settings:
+ <<: *docker_variables
+ tags:
+ - latest-arm64
+ - develop-arm64
+ - ${CI_COMMIT_SHA}-arm64
+
docker-stable-amd64:
image: *kaniko_image
- # when:
- # - platform: linux/amd64
- # does not work even though it should according to docs
- # https://github.com/woodpecker-ci/woodpecker/discussions/5367#discussioncomment-13901342
when:
- - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "push"'
- - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_TAG == ""'
+ - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == "stable"'
+ - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
settings:
<<: *docker_variables
tags: &amd64_tags
- latest-amd64
- stable-amd64
- ${CI_COMMIT_SHA}-amd64
docker-stable-tag-amd64:
image: *kaniko_image
when:
- - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "tag"'
- - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_TAG != ""'
+ - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "tag" && CI_COMMIT_BRANCH == "stable"'
+ - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
settings:
<<: *docker_variables
tags:
- <<: *amd64_tags
- ${CI_COMMIT_TAG}-amd64
docker-stable-arm64:
image: *kaniko_image
when:
- - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "push"'
- - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_TAG == ""'
+ - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == "stable"'
+ - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
settings:
<<: *docker_variables
tags: &arm64_tags
- latest-arm64
- stable-arm64
- ${CI_COMMIT_SHA}-arm64
docker-stable-tag-arm64:
image: *kaniko_image
when:
- - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "tag"'
- - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_TAG != ""'
+ - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "tag" && CI_COMMIT_BRANCH == "stable"'
+ - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
settings:
<<: *docker_variables
tags:
- <<: *arm64_tags
- ${CI_COMMIT_TAG}-arm64

File Metadata

Mime Type
text/x-diff
Expires
Sat, Oct 31, 8:50 AM (17 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1801194
Default Alt Text
(9 KB)

Event Timeline