From 0e64b7232f7afd32d0bb244535b3cf9d7dc98a44 Mon Sep 17 00:00:00 2001 From: Ruben Momoa Date: Mon, 26 Aug 2024 12:20:46 +0200 Subject: [PATCH 1/6] gen tags test --- .woodpecker/build_dev.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.woodpecker/build_dev.yml b/.woodpecker/build_dev.yml index 794e833..c814ade 100644 --- a/.woodpecker/build_dev.yml +++ b/.woodpecker/build_dev.yml @@ -10,6 +10,14 @@ when: event: [ push, manual ] steps: + + gen_tags: + image: docker + commands: + - pwd + - gen-version-list.sh "v2.0.4" php-${PHP_VERSION} + - cat tags.txt + dev_alpine_build_and_publish: image: woodpeckerci/plugin-docker-buildx settings: From 68855113eba1cc1693eaed8c46a04dcf01ec4d42 Mon Sep 17 00:00:00 2001 From: Ruben Momoa Date: Mon, 26 Aug 2024 12:21:34 +0200 Subject: [PATCH 2/6] gen tags test --- .woodpecker/build_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build_dev.yml b/.woodpecker/build_dev.yml index c814ade..726be7f 100644 --- a/.woodpecker/build_dev.yml +++ b/.woodpecker/build_dev.yml @@ -15,7 +15,7 @@ steps: image: docker commands: - pwd - - gen-version-list.sh "v2.0.4" php-${PHP_VERSION} + - ./gen-version-list.sh "v2.0.4" php-${PHP_VERSION} - cat tags.txt dev_alpine_build_and_publish: From a74d2c217b595ca58b87134f08eaef4a54b36caa Mon Sep 17 00:00:00 2001 From: Ruben Momoa Date: Mon, 26 Aug 2024 12:27:19 +0200 Subject: [PATCH 3/6] gen tags test --- gen-version-list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen-version-list.sh b/gen-version-list.sh index 67612b3..d707f8c 100755 --- a/gen-version-list.sh +++ b/gen-version-list.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env ash # this script generates a tags_file for Buildx (https://woodpecker-ci.org/plugins/Docker%20Buildx) From 07725c2ced6703f8b56cca52446e66ec442b1289 Mon Sep 17 00:00:00 2001 From: Ruben Momoa Date: Mon, 26 Aug 2024 13:39:30 +0200 Subject: [PATCH 4/6] gen tags test --- gen-version-list.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gen-version-list.sh b/gen-version-list.sh index d707f8c..2870132 100755 --- a/gen-version-list.sh +++ b/gen-version-list.sh @@ -21,13 +21,10 @@ if [[ "${version:0:1}" == "V" || "${version:0:1}" == "v" ]]; then fi # Split the version into an array using the "." as a delimiter -IFS='.' read -ra version_array <<< "$version" +# this sets $1 $2 and $3 +IFS='.' set -- "$version" echo "latest$suffix" > tags.txt - -# Iterate through the array and print each element followed by a new line -build_string="" -for i in "${version_array[@]}"; do - build_string="$build_string.$i" - echo "${build_string#?}$suffix" >> tags.txt -done \ No newline at end of file +echo "$1$suffix" >> tags.txt +echo "$1.$2$suffix" >> tags.txt +echo "$1.$2.$3$suffix" >> tags.txt \ No newline at end of file From cbe5ac45d9c10010bbdd3eb5bc6a0f71481bc90e Mon Sep 17 00:00:00 2001 From: Ruben Momoa Date: Mon, 26 Aug 2024 13:42:10 +0200 Subject: [PATCH 5/6] move script and add to dev build trigger [SKIP CI] --- .woodpecker/build_dev.yml | 2 +- gen-version-list.sh => gen-tag-list.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename gen-version-list.sh => gen-tag-list.sh (100%) diff --git a/.woodpecker/build_dev.yml b/.woodpecker/build_dev.yml index 726be7f..3cb0c57 100644 --- a/.woodpecker/build_dev.yml +++ b/.woodpecker/build_dev.yml @@ -6,7 +6,7 @@ when: branch: exclude: [ main, master ] path: - include: [ '.woodpecker/build_dev.yml', 'build/*', 'Dockerfile' ] + include: [ '.woodpecker/build_dev.yml', 'build/*', 'Dockerfile', 'gen-tag-list.sh' ] event: [ push, manual ] steps: diff --git a/gen-version-list.sh b/gen-tag-list.sh similarity index 100% rename from gen-version-list.sh rename to gen-tag-list.sh From ec706bc863d43d782c5c83b9c3ccabf6bd8debff Mon Sep 17 00:00:00 2001 From: Ruben Momoa Date: Mon, 26 Aug 2024 13:46:02 +0200 Subject: [PATCH 6/6] execute script in current dir [SKIP CI] --- .woodpecker/build_dev.yml | 8 -------- .woodpecker/build_release.yml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.woodpecker/build_dev.yml b/.woodpecker/build_dev.yml index 3cb0c57..4c03e75 100644 --- a/.woodpecker/build_dev.yml +++ b/.woodpecker/build_dev.yml @@ -10,14 +10,6 @@ when: event: [ push, manual ] steps: - - gen_tags: - image: docker - commands: - - pwd - - ./gen-version-list.sh "v2.0.4" php-${PHP_VERSION} - - cat tags.txt - dev_alpine_build_and_publish: image: woodpeckerci/plugin-docker-buildx settings: diff --git a/.woodpecker/build_release.yml b/.woodpecker/build_release.yml index e267237..029c8ec 100644 --- a/.woodpecker/build_release.yml +++ b/.woodpecker/build_release.yml @@ -31,7 +31,7 @@ steps: gen_tags: image: docker commands: - - gen-version-list.sh ${CI_COMMIT_TAG} php-${PHP_VERSION} + - ./gen-version-list.sh ${CI_COMMIT_TAG} php-${PHP_VERSION} - cat tags.txt release_alpine_build_and_publish: