From 02148677a87d4f4fba910a6ad6c033f2b6cca6df Mon Sep 17 00:00:00 2001 From: jackgopack4 Date: Thu, 18 Jul 2024 13:21:40 -0400 Subject: [PATCH] re-add validate_versions --- .github/workflows/prepare-release.yml | 52 +++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 65472a63785..d3603b82983 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -20,37 +20,37 @@ on: description: Current version (beta, like 0.95.1). Don't include `v`. jobs: #validate-version format - # validate-versions: - # runs-on: ubuntu-latest + validate-versions: + runs-on: ubuntu-latest - # steps: - # - name: Validate version format - # run: | - # validate_beta_version() { - # local regex_pattern_beta='^[0-9]+\.[0-9]+\.[0-9]+$' - # if [[ ! "$1" =~ $regex_pattern_beta ]]; then - # echo "Invalid $2 version format. For beta, it can be 0.1.0 or higher" - # exit 1 - # fi - # } + steps: + - name: Validate version format + run: | + validate_beta_version() { + local regex_pattern_beta='^[0-9]+\.[0-9]+\.[0-9]+$' + if [[ ! "$1" =~ $regex_pattern_beta ]]; then + echo "Invalid $2 version format. For beta, it can be 0.1.0 or higher" + exit 1 + fi + } - # validate_stable_version() { - # local regex_pattern_stable='^[1-9][0-9]*\.[0-9]+\.[0-9]+$' - # if [[ ! "$1" =~ $regex_pattern_stable ]]; then - # echo "Invalid stable version format for $2. Major version must be greater than 1." - # exit 1 - # fi - # } + validate_stable_version() { + local regex_pattern_stable='^[1-9][0-9]*\.[0-9]+\.[0-9]+$' + if [[ ! "$1" =~ $regex_pattern_stable ]]; then + echo "Invalid stable version format for $2. Major version must be greater than 1." + exit 1 + fi + } - # validate_beta_version "${{ inputs.candidate-beta }}" "candidate-beta" - # validate_beta_version "${{ inputs.current-beta }}" "current-beta" - # validate_stable_version "${{ inputs.candidate-stable }}" "candidate-stable" - # validate_stable_version "${{ inputs.current-stable }}" "current-stable" - # shell: bash + validate_beta_version "${{ inputs.candidate-beta }}" "candidate-beta" + validate_beta_version "${{ inputs.current-beta }}" "current-beta" + validate_stable_version "${{ inputs.candidate-stable }}" "candidate-stable" + validate_stable_version "${{ inputs.current-stable }}" "current-stable" + shell: bash # Releasing opentelemetry-collector prepare-release: - # needs: - # - validate-versions + needs: + - validate-versions runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7