From 6030236c30587cc1c5b398d1610ae06cfb709c01 Mon Sep 17 00:00:00 2001 From: adeeri Date: Wed, 12 Jun 2024 13:55:31 +0200 Subject: [PATCH] Temporarily disable lint warnings --- .../workflows/build_test_publish_release.yml | 8 +++---- build.sh | 22 ++++++++++++++----- variables.env | 10 ++++----- versions.inc.sh | 6 ++--- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_test_publish_release.yml b/.github/workflows/build_test_publish_release.yml index ab6aef505..823a4b834 100644 --- a/.github/workflows/build_test_publish_release.yml +++ b/.github/workflows/build_test_publish_release.yml @@ -41,12 +41,12 @@ jobs: git config --global user.name 'wikibase suite github actions bot' git config --global user.email 'wikibase-suite-github-actions-bot@users.noreply.github.com' - if git tag "$WMDE_RELEASE_VERSION"; then - git push --tags origin "$WMDE_RELEASE_VERSION" + if git tag "$WIKIBASE_VERSION"; then + git push --tags origin "$WIKIBASE_VERSION" else echo "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***" - echo "Cannot tag $WMDE_RELEASE_VERSION, Most probably this tag is already given to another commit." - echo "Make sure to update the WMDE_RELEASE_VERSION variable in variables.env to publish a new release." + echo "Cannot tag $WIKIBASE_VERSION, Most probably this tag is already given to another commit." + echo "Make sure to update the WIKIBASE_VERSION variable in variables.env to publish a new release." echo "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***" fi diff --git a/build.sh b/build.sh index 234564966..7ca17790d 100755 --- a/build.sh +++ b/build.sh @@ -55,7 +55,7 @@ function build_wikibase { $DOCKER_BUILD_CACHE_OPT \ --build-arg PHP_IMAGE_URL="$PHP_IMAGE_URL" \ --build-arg COMPOSER_IMAGE_URL="$COMPOSER_IMAGE_URL" \ - --build-arg WMDE_RELEASE_VERSION="$WMDE_RELEASE_VERSION" \ + --build-arg WIKIBASE_VERSION="$WIKIBASE_VERSION" \ --build-arg MEDIAWIKI_VERSION="$MEDIAWIKI_VERSION" \ \ --build-arg WIKIBASE_COMMIT="$WIKIBASE_COMMIT" \ @@ -85,10 +85,12 @@ function build_wikibase { \ build/Wikibase - tags=$(version_tags "wikibase") - for tag in $tags; do - docker tag "$WIKIBASE_SUITE_WIKIBASE_IMAGE_URL" "$WIKIBASE_SUITE_WIKIBASE_IMAGE_URL:$tag" - done + # shellcheck disable=SC2178 + tags=$(version_tags "wikibase") + # shellcheck disable=SC2178 + for tag in $tags; do + docker tag "$WIKIBASE_SUITE_WIKIBASE_IMAGE_URL" "$WIKIBASE_SUITE_WIKIBASE_IMAGE_URL:$tag" + done } @@ -104,7 +106,9 @@ function build_elasticseach { \ build/Elasticsearch + # shellcheck disable=SC2178 tags=$(version_tags "elasticsearch") + # shellcheck disable=SC2178 for tag in $tags; do docker tag "$WIKIBASE_SUITE_ELASTICSEARCH_IMAGE_URL" "$WIKIBASE_SUITE_ELASTICSEARCH_IMAGE_URL:$tag" done @@ -123,7 +127,9 @@ function build_wdqs { \ build/WDQS + # shellcheck disable=SC2178 tags=$(version_tags "wdqs") + # shellcheck disable=SC2178 for tag in $tags; do docker tag "$WIKIBASE_SUITE_WDQS_IMAGE_URL" "$WIKIBASE_SUITE_WDQS_IMAGE_URL:$tag" done @@ -143,7 +149,9 @@ function build_wdqs-frontend { \ build/WDQS-frontend + # shellcheck disable=SC2178 tags=$(version_tags "wdqs-frontend") + # shellcheck disable=SC2178 for tag in $tags; do docker tag "$WIKIBASE_SUITE_WDQS_FRONTEND_IMAGE_URL" "$WIKIBASE_SUITE_WDQS_FRONTEND_IMAGE_URL:$tag" done @@ -160,7 +168,9 @@ function build_wdqs-proxy { \ build/WDQS-proxy + # shellcheck disable=SC2178 tags=$(version_tags "wdqs-proxy") + # shellcheck disable=SC2178 for tag in $tags; do docker tag "$WIKIBASE_SUITE_WDQS_PROXY_IMAGE_URL" "$WIKIBASE_SUITE_WDQS_PROXY_IMAGE_URL:$tag" done @@ -183,7 +193,9 @@ function build_quickstatements { \ build/QuickStatements + # shellcheck disable=SC2178 tags=$(version_tags "quickstatements") + # shellcheck disable=SC2178 for tag in $tags; do docker tag "$WIKIBASE_SUITE_QUICKSTATEMENTS_IMAGE_URL" "$WIKIBASE_SUITE_QUICKSTATEMENTS_IMAGE_URL:$tag" done diff --git a/variables.env b/variables.env index 593860115..e362b22b7 100644 --- a/variables.env +++ b/variables.env @@ -7,8 +7,8 @@ # Append -prerelease while working on releases. # Remove -prerelease when ready to merge release to the release branch. # Call it main on the main branch. -WMDE_RELEASE_VERSION=2.3.0 -EXAMPLE_VERSION=4.1.0 +WIKIBASE_VERSION=2.3.0 +DEPLOYMENT_KIT_VERSION=4.1.0 # ############################################################################## @@ -32,8 +32,8 @@ MEDIAWIKI_VERSION=1.41.1 # TODO: Add our own (semantic) version to hide this one? WDQS_VERSION=0.3.137 # TODO: Decide on the independent versions to start from -WDQS_FRONTED_VERSION=$WMDE_RELEASE_VERSION -WDQS_PROXY_VERSION=$WMDE_RELEASE_VERSION +WDQS_FRONTED_VERSION=$WIKIBASE_VERSION +WDQS_PROXY_VERSION=$WIKIBASE_VERSION # ############################################################################## @@ -169,7 +169,7 @@ WIKIBASEEDTF_COMMIT=5596403a27d8e4a5ac044257c49be3e0685318a6 QUICKSTATEMENTS_COMMIT=c4b2c6b086b319aa32dcdd7a323edf188faaa66d # https://bitbucket.org/magnusmanske/magnustools/commits/branch/master MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5 -QUICKSTATEMENTS_VERSION=$WMDE_RELEASE_VERSION +QUICKSTATEMENTS_VERSION=$WIKIBASE_VERSION # ############################################################################## diff --git a/versions.inc.sh b/versions.inc.sh index 142e4d511..27512a62d 100644 --- a/versions.inc.sh +++ b/versions.inc.sh @@ -16,7 +16,7 @@ function image_version { image=$1 if [ "$image" = "wikibase" ]; then - echo "$WMDE_RELEASE_VERSION" + echo "$WIKIBASE_VERSION" elif [ "$image" = "elasticsearch" ]; then echo "$ELASTICSEARCH_VERSION" elif [ "$image" = "wdqs" ]; then @@ -39,12 +39,12 @@ function version_tags() { "$version" "${version%.*}" "${version%%.*}" - "example-${EXAMPLE_VERSION%%.*}" + "example-${DEPLOYMENT_KIT_VERSION%%.*}" ) # Extra tag for wikibase if [[ "$image_name" == "wikibase" ]]; then - tags+=("${WMDE_RELEASE_VERSION}_mw-${MEDIAWIKI_VERSION}") + tags+=("${WIKIBASE_VERSION}_mw-${MEDIAWIKI_VERSION}") fi printf "%s\n" "${tags[@]}"