From 15092e4265882dd4266aa528244ced49caa0a114 Mon Sep 17 00:00:00 2001 From: Yevhen Hrytsai Date: Sat, 27 Jul 2024 21:32:22 +0300 Subject: [PATCH] Fix release-check job and update actions' versions --- .github/workflows/bitbucket-int-tests.yml | 10 +++---- .github/workflows/confluence-int-tests.yml | 10 +++---- .github/workflows/jira-int-tests.yml | 10 +++---- .github/workflows/release.yml | 6 ++-- .../run-product-release-check.sh | 28 +++++++++++++++++-- 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.github/workflows/bitbucket-int-tests.yml b/.github/workflows/bitbucket-int-tests.yml index dc986e63..0d035059 100644 --- a/.github/workflows/bitbucket-int-tests.yml +++ b/.github/workflows/bitbucket-int-tests.yml @@ -20,7 +20,7 @@ jobs: timeout-minutes: 30 steps: - run: echo 'Github event inputs [${{ toJson(github.event.inputs) }}].' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.ref }} # Dec 13, 2022 @@ -28,18 +28,18 @@ jobs: # install last supported git - 2.37.4; remove this trick once Bitbucket implements support for latest git # https://confluence.atlassian.com/bitbucketserver/supported-platforms-776640981.html#Supportedplatforms-dvcsDVCS - run: bin/build/install-supported-git.sh - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: ${{ github.event.inputs.java-version }} distribution: adopt - run: bin/build/install-plugin-sdk.sh - run: bin/build/override-plugin-sdk-maven.sh - run: bin/build/install-int-test-libs.sh - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: maven-unit - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository/com/atlassian/bitbucket key: maven-integration-bitbucket-${{ github.event.inputs.product-version }} @@ -47,7 +47,7 @@ jobs: - run: | VERSION=${{ github.event.inputs.product-version }} \ bin/build/run-bitbucket-its.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: webdriver-screenshots-bitbucket-${{ github.event.inputs.product-version }}-java-${{ github.event.inputs.java-version }} diff --git a/.github/workflows/confluence-int-tests.yml b/.github/workflows/confluence-int-tests.yml index 248b3fa5..abf043c2 100644 --- a/.github/workflows/confluence-int-tests.yml +++ b/.github/workflows/confluence-int-tests.yml @@ -20,21 +20,21 @@ jobs: timeout-minutes: 30 steps: - run: echo 'Github event inputs [${{ toJson(github.event.inputs) }}].' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.ref }} - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: ${{ github.event.inputs.java-version }} distribution: adopt - run: bin/build/install-plugin-sdk.sh - run: bin/build/override-plugin-sdk-maven.sh - run: bin/build/install-int-test-libs.sh - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: maven-unit - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository/com/atlassian/confluence key: maven-integration-confluence-${{ github.event.inputs.product-version }} @@ -42,7 +42,7 @@ jobs: - run: | VERSION=${{ github.event.inputs.product-version }} \ bin/build/run-confluence-its.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: webdriver-screenshots-confluence-${{ github.event.inputs.product-version }}-java-${{ github.event.inputs.java-version }} diff --git a/.github/workflows/jira-int-tests.yml b/.github/workflows/jira-int-tests.yml index 11ed242b..9377d39c 100644 --- a/.github/workflows/jira-int-tests.yml +++ b/.github/workflows/jira-int-tests.yml @@ -23,21 +23,21 @@ jobs: timeout-minutes: 30 steps: - run: echo 'Github event inputs [${{ toJson(github.event.inputs) }}].' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.ref }} - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: ${{ github.event.inputs.java-version }} distribution: adopt - run: bin/build/install-plugin-sdk.sh - run: bin/build/override-plugin-sdk-maven.sh - run: bin/build/install-int-test-libs.sh - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: maven-unit - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository/com/atlassian/jira key: maven-integration-jira-${{ github.event.inputs.product-version }} @@ -46,7 +46,7 @@ jobs: VERSION=${{ github.event.inputs.product-version }} \ TESTKIT_VERSION=${{ github.event.inputs.testkit-version }} \ bin/build/run-jira-its.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: webdriver-screenshots-jira-${{ github.event.inputs.product-version }}-java-${{ github.event.inputs.java-version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index adce7335..f08233b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: echo 'Release version [${{ github.event.inputs.release-version }}].' echo 'Next development version [${{ github.event.inputs.next-development-version }}].' - name: Check out the code from selected branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.ref }} - name: Configure git for operations performed during the release @@ -45,7 +45,7 @@ jobs: - name: Populate plugin module by selected product run: bin/build/populate-plugin-by-product.sh ${{ github.event.inputs.product }} - name: Install JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: temurin @@ -55,7 +55,7 @@ jobs: run: bin/build/install-plugin-sdk.sh - run: bin/build/override-plugin-sdk-maven.sh - name: Unpack cached Maven dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: maven-release diff --git a/bin/release-check/run-product-release-check.sh b/bin/release-check/run-product-release-check.sh index 53302dc3..ab080ec4 100755 --- a/bin/release-check/run-product-release-check.sh +++ b/bin/release-check/run-product-release-check.sh @@ -12,8 +12,32 @@ if [ "$latest_releases" = "" ]; then exit fi -# TAKE AND CHECKS LATEST VERSION ONLY, MEANING THE GREATEST REVISION VERSION -latest_version=$(echo "$latest_releases" | tail -1) +case $PRODUCT in + jira) + version_regex="[0-9]\\.[0-9]+\\.[0-9]+" + ;; + confluence|bitbucket) + version_regex="[0-8]\\.[0-9]+\\.[0-9]+" + ;; + *) + echo "Invalid product" + exit 1 + ;; +esac + +latest_version=$(echo "$latest_releases" | grep -oE "$version_regex" | tail -1) + +if [ "$latest_version" = "" ]; then + echo "Could not find latest versions" + echo "Product [$PRODUCT]" + echo "Compatible version pattern [$version_regex]" + exit +fi + +echo "========================" +echo "LATEST VERSION" +echo "$latest_version" +echo "========================" # RUN CHECK FOR LATEST VERSION PRODUCT_VERSION="$latest_version" . ./check-release.sh