diff --git a/.circleci/config.yml b/.circleci/config.yml index e645b610f..215d7c916 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,6 +31,12 @@ aliases: branches: ignore: /.*/ + - &filters-publish + branches: + ignore: /.*/ + tags: + ignore: /.*/ + - &branches-special - main - /^hotfix.*$/ @@ -355,11 +361,7 @@ workflows: - test-preview-service - publish-helm-chart: - filters: &filters-publish - branches: - only: *branches-special - tags: - only: &filters-tag /^[0-9]+\.[0-9]+\.[0-9]+$/ + filters: *filters-publish requires: # - deployment-test-docker-compose #FIXME uncomment when nix https://search.nixos.org/packages?channel=24.05&show=tilt&from=0&size=50&sort=relevance&type=packages&query=tilt supports tilt >v0.33.12 which includes docker compose up --wait flag - deployment-test-helm-chart @@ -374,11 +376,7 @@ workflows: - get-version - publish-helm-chart-oci: - filters: &filters-publish - branches: - only: *branches-special - tags: - only: &filters-tag /^[0-9]+\.[0-9]+\.[0-9]+$/ + filters: *filters-publish context: - docker-hub requires: @@ -397,7 +395,7 @@ workflows: - publish-npm: filters: tags: - only: *filters-tag + ignore: /.*/ branches: ignore: /.*/ context: diff --git a/.github/workflows/scripts/publish_helm_chart_commit.sh b/.github/workflows/scripts/publish_helm_chart_commit.sh index 54920bf60..8928e3b03 100644 --- a/.github/workflows/scripts/publish_helm_chart_commit.sh +++ b/.github/workflows/scripts/publish_helm_chart_commit.sh @@ -41,7 +41,7 @@ if [[ "${GITHUB_REF}" == refs/tags/* || "${GITHUB_REF_NAME}" == "${HELM_STABLE_B CURRENT_VERSION="$(grep ^version "${GIT_HELM}/charts/speckle-server/Chart.yaml" | grep -o '2\..*')" echo "ℹ️ Current version ${CURRENT_VERSION}" - .github/workflows/scripts/check_version.py "${CURRENT_VERSION}" "${RELEASE_VERSION}" + "${GIT_ROOT}/workflows/scripts/check_version.py" "${CURRENT_VERSION}" "${RELEASE_VERSION}" if [ $? -eq 1 ] then echo "The current helm chart version '${CURRENT_VERSION}' is newer than the version '${RELEASE_VERSION}' we are attempting to publish. Exiting"