Skip to content

Commit 5c9f0b3

Browse files
committed
Remove repository-version.env
1 parent fe7a3cd commit 5c9f0b3

5 files changed

Lines changed: 20 additions & 11 deletions

File tree

.github/actions/build-docker-image-parallel-processes/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: build-docker-image-parallel-processes
22
description: Build Docker image parallel-processes
33

44
inputs:
5+
version:
6+
description: 'Version to build'
7+
required: true
58
DOCKER_HUB_TOKEN:
69
description: 'hub.docker.com token'
710
required: true
@@ -14,4 +17,4 @@ runs:
1417
run: echo "${{ inputs.DOCKER_HUB_TOKEN }}" | docker login --username steevanb --password-stdin
1518
-
1619
shell: bash
17-
run: bin/parallel-processes/docker --push
20+
run: bin/parallel-processes/docker --version=${{ inputs.version }} --push

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,5 @@ jobs:
5252
name: Build and push Docker image parallel-processes-${{ github.event.inputs.version }}
5353
uses: ./.github/actions/build-docker-image-parallel-processes
5454
with:
55+
version: ${{ github.event.inputs.version }}
5556
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

bin/parallel-processes/docker

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,22 @@ set -eu
44

55
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
66

7+
REPOSITORY_VERSION=
8+
remaining_args=()
9+
for param in "$@"; do
10+
if [[ "${param}" == --version=* ]]; then
11+
REPOSITORY_VERSION="${param#--version=}"
12+
else
13+
remaining_args+=("${param}")
14+
fi
15+
done
16+
if [ -z "${REPOSITORY_VERSION}" ]; then
17+
echo "Error: --version=X.X.X is required"
18+
exit 1
19+
fi
20+
set -- "${remaining_args[@]+"${remaining_args[@]}"}"
21+
722
source "${ROOT_DIR}"/config/version/composer-version.env
8-
source "${ROOT_DIR}"/config/version/repository-version.env
923
source "${ROOT_DIR}"/config/docker/parallel-processes-docker-image-name.env
1024
source "${ROOT_DIR}"/bin/theme.inc.bash
1125

bin/release/prepare

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,9 @@ function updateChangelog() {
7777
"${ROOT_DIR}"/bin/release/changelog "${NEW_REPOSITORY_VERSION}"
7878
}
7979

80-
function updateRepositoryVersion() {
81-
trap onError ERR
82-
83-
echo "Edit REPOSITORY_VERSION"
84-
echo "REPOSITORY_VERSION=${NEW_REPOSITORY_VERSION}" > "${ROOT_DIR}"/config/version/repository-version.env
85-
}
86-
8780
initLog
8881
updateReleaseBadge
8982
updateCodeLinesBadge
9083
updateCoverageBadge
9184
updateComposerRequire
9285
updateChangelog
93-
updateRepositoryVersion

config/version/repository-version.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)