From c69486599c5615a6be059de7aacd759423d8fbd4 Mon Sep 17 00:00:00 2001 From: Steevan BARBOYON Date: Fri, 27 Feb 2026 00:06:07 +0100 Subject: [PATCH] Remove repository-version.env --- .../action.yml | 5 ++++- .github/workflows/release.yml | 1 + bin/parallel-processes/docker | 16 +++++++++++++++- bin/release/prepare | 8 -------- config/version/repository-version.env | 1 - 5 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 config/version/repository-version.env diff --git a/.github/actions/build-docker-image-parallel-processes/action.yml b/.github/actions/build-docker-image-parallel-processes/action.yml index ab5ca4e..1159992 100644 --- a/.github/actions/build-docker-image-parallel-processes/action.yml +++ b/.github/actions/build-docker-image-parallel-processes/action.yml @@ -2,6 +2,9 @@ name: build-docker-image-parallel-processes description: Build Docker image parallel-processes inputs: + version: + description: 'Version to build' + required: true DOCKER_HUB_TOKEN: description: 'hub.docker.com token' required: true @@ -14,4 +17,4 @@ runs: run: echo "${{ inputs.DOCKER_HUB_TOKEN }}" | docker login --username steevanb --password-stdin - shell: bash - run: bin/parallel-processes/docker --push + run: bin/parallel-processes/docker --version=${{ inputs.version }} --push diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93a9303..463ce5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,4 +52,5 @@ jobs: name: Build and push Docker image parallel-processes-${{ github.event.inputs.version }} uses: ./.github/actions/build-docker-image-parallel-processes with: + version: ${{ github.event.inputs.version }} DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }} diff --git a/bin/parallel-processes/docker b/bin/parallel-processes/docker index e363299..af38578 100755 --- a/bin/parallel-processes/docker +++ b/bin/parallel-processes/docker @@ -4,8 +4,22 @@ set -eu readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")" +REPOSITORY_VERSION= +remaining_args=() +for param in "$@"; do + if [[ "${param}" == --version=* ]]; then + REPOSITORY_VERSION="${param#--version=}" + else + remaining_args+=("${param}") + fi +done +if [ -z "${REPOSITORY_VERSION}" ]; then + echo "Error: --version=X.X.X is required" + exit 1 +fi +set -- "${remaining_args[@]+"${remaining_args[@]}"}" + source "${ROOT_DIR}"/config/version/composer-version.env -source "${ROOT_DIR}"/config/version/repository-version.env source "${ROOT_DIR}"/config/docker/parallel-processes-docker-image-name.env source "${ROOT_DIR}"/bin/theme.inc.bash diff --git a/bin/release/prepare b/bin/release/prepare index 62d5ff9..ed11d76 100755 --- a/bin/release/prepare +++ b/bin/release/prepare @@ -77,17 +77,9 @@ function updateChangelog() { "${ROOT_DIR}"/bin/release/changelog "${NEW_REPOSITORY_VERSION}" } -function updateRepositoryVersion() { - trap onError ERR - - echo "Edit REPOSITORY_VERSION" - echo "REPOSITORY_VERSION=${NEW_REPOSITORY_VERSION}" > "${ROOT_DIR}"/config/version/repository-version.env -} - initLog updateReleaseBadge updateCodeLinesBadge updateCoverageBadge updateComposerRequire updateChangelog -updateRepositoryVersion diff --git a/config/version/repository-version.env b/config/version/repository-version.env deleted file mode 100644 index 0c524c9..0000000 --- a/config/version/repository-version.env +++ /dev/null @@ -1 +0,0 @@ -REPOSITORY_VERSION=1.2.0