From 70c6d8a35a4fc372ceb113a165b09e2cedc8f407 Mon Sep 17 00:00:00 2001 From: Jon Clucas Date: Wed, 10 Jul 2024 13:00:10 -0400 Subject: [PATCH] :construction_worker: Replace non-`\w`-non-dot characters with hyphens --- .circleci/main.yml | 2 +- .github/workflows/build_C-PAC.yml | 2 +- .github/workflows/regression_test_full.yml | 2 +- .github/workflows/regression_test_lite.yml | 2 +- .github/workflows/smoke_test_participant.yml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/main.yml b/.circleci/main.yml index a13300a78d..1fd1120701 100644 --- a/.circleci/main.yml +++ b/.circleci/main.yml @@ -156,7 +156,7 @@ commands: then TAG=nightly else - TAG="${CIRCLE_BRANCH//\//_}" + TAG=`echo ${CIRCLE_BRANCH} | sed 's/[^a-zA-Z0-9._]/-/g')` fi DOCKER_TAG="ghcr.io/${CIRCLE_PROJECT_USERNAME,,}/${CIRCLE_PROJECT_REPONAME,,}:${TAG,,}" if [[ -n "<< parameters.variant >>" ]] diff --git a/.github/workflows/build_C-PAC.yml b/.github/workflows/build_C-PAC.yml index d126f6a778..d09c9ffaa3 100644 --- a/.github/workflows/build_C-PAC.yml +++ b/.github/workflows/build_C-PAC.yml @@ -42,7 +42,7 @@ jobs: GITHUB_BRANCH=$(echo ${GITHUB_REF} | cut -d '/' -f 3-) if [[ ! $GITHUB_BRANCH == 'main' ]] && [[ ! $GITHUB_BRANCH == 'develop' ]] then - TAG=${GITHUB_BRANCH//\//_} + TAG=`echo ${GITHUB_BRANCH} | sed 's/[^a-zA-Z0-9._]/-/g')` DOCKERFILE=.github/Dockerfiles/C-PAC.develop$VARIANT-$OS.Dockerfile elif [[ $GITHUB_BRANCH == 'develop' ]] then diff --git a/.github/workflows/regression_test_full.yml b/.github/workflows/regression_test_full.yml index 6dba2d1bf2..63d910dfc9 100644 --- a/.github/workflows/regression_test_full.yml +++ b/.github/workflows/regression_test_full.yml @@ -13,7 +13,7 @@ jobs: GITHUB_BRANCH=$(echo ${GITHUB_REF} | cut -d '/' -f 3-) if [[ ! $GITHUB_BRANCH == 'main' ]] && [[ ! $GITHUB_BRANCH == 'develop' ]] then - TAG=${GITHUB_BRANCH//\//_} + TAG=`echo ${GITHUB_BRANCH} | sed 's/[^a-zA-Z0-9._]/-/g')` elif [[ $GITHUB_BRANCH == 'develop' ]] then TAG=nightly diff --git a/.github/workflows/regression_test_lite.yml b/.github/workflows/regression_test_lite.yml index 4e6b5a46f6..8f3735e863 100644 --- a/.github/workflows/regression_test_lite.yml +++ b/.github/workflows/regression_test_lite.yml @@ -37,7 +37,7 @@ jobs: run: | if [[ ! $GITHUB_REF_NAME == 'main' ]] && [[ ! $GITHUB_REF_NAME == 'develop' ]] then - TAG=${GITHUB_REF_NAME//\//_} + TAG=`echo ${GITHUB_REF_NAME} | sed 's/[^a-zA-Z0-9._]/-/g')` elif [[ $GITHUB_REF_NAME == 'develop' ]] then TAG=nightly diff --git a/.github/workflows/smoke_test_participant.yml b/.github/workflows/smoke_test_participant.yml index 3fde0de8aa..81e4bc4ae5 100644 --- a/.github/workflows/smoke_test_participant.yml +++ b/.github/workflows/smoke_test_participant.yml @@ -68,7 +68,7 @@ jobs: GITHUB_BRANCH=$(echo ${GITHUB_REF} | cut -d '/' -f 3-) if [[ ! $GITHUB_BRANCH == 'main' ]] && [[ ! $GITHUB_BRANCH == 'develop' ]] then - TAG=${GITHUB_BRANCH//\//_} + TAG=`echo ${GITHUB_BRANCH} | sed 's/[^a-zA-Z0-9._]/-/g')` elif [[ $GITHUB_BRANCH == 'develop' ]] then TAG=nightly @@ -133,7 +133,7 @@ jobs: GITHUB_BRANCH=$(echo ${GITHUB_REF} | cut -d '/' -f 3-) if [[ ! $GITHUB_BRANCH == 'main' ]] && [[ ! $GITHUB_BRANCH == 'develop' ]] then - TAG=${GITHUB_BRANCH//\//_} + TAG=`echo ${GITHUB_BRANCH} | sed 's/[^a-zA-Z0-9._]/-/g')` elif [[ $GITHUB_BRANCH == 'develop' ]] then TAG=nightly @@ -192,7 +192,7 @@ jobs: GITHUB_BRANCH=$(echo ${GITHUB_REF} | cut -d '/' -f 3-) if [[ ! $GITHUB_BRANCH == 'main' ]] && [[ ! $GITHUB_BRANCH == 'develop' ]] then - TAG=${GITHUB_BRANCH//\//_} + TAG=`echo ${GITHUB_BRANCH} | sed 's/[^a-zA-Z0-9._]/-/g')` elif [[ $GITHUB_BRANCH == 'develop' ]] then TAG=nightly