From 367a1c08840ba8a5595b3ccc12baa9c470ec77a9 Mon Sep 17 00:00:00 2001 From: rmch91 Date: Fri, 1 Mar 2024 17:30:42 +0100 Subject: [PATCH] changes --- .github/workflows/minor-release.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/minor-release.yml b/.github/workflows/minor-release.yml index 50e6290d5a7..60cdc7f4090 100644 --- a/.github/workflows/minor-release.yml +++ b/.github/workflows/minor-release.yml @@ -31,7 +31,7 @@ jobs: echo "version=2209.10.0" >> $GITHUB_ENV else echo "version=${{ github.event.inputs.version }}" >> $GITHUB_ENV - fi; + fi - name: Create Release Branch run: | @@ -43,7 +43,7 @@ jobs: else version_part=$version prerelease="" - fi; + fi IFS='.' read -ra ADDR <<< "$version_part" echo "major=${ADDR[0]}" >> $GITHUB_ENV @@ -53,17 +53,12 @@ jobs: if [[ -n $prerelease ]]; then release_branch="${release_branch}-${prerelease// /-}" - fi; + fi echo "RELEASE_BRANCH=$release_branch" >> $GITHUB_ENV - echo "Checking for existence of the branch: $release_branch" - if git ls-remote --heads origin "$release_branch" | grep -q "$release_branch"; then - echo "Error: Branch $release_branch already exists. Please check the branch before proceeding." - exit 1 - else - echo "Branch $release_branch does not exist. Creating new one." - git checkout -b "$release_branch" + + git checkout -b "$release_branch" - name: Update SCSS Versioning run: | @@ -87,8 +82,7 @@ jobs: echo "Error: The configuration file is not up to date. Regenerating dependencies..." npm run generate:deps npm run config:update - fi; - + fi npm run generate:deps npm run test:all-schematics @@ -103,7 +97,7 @@ jobs: with: branch: "${{ env.RELEASE_BRANCH }}" delete-branch: true - title: "Release ${{ env.version }}" + title: "Release ${{ github.event.inputs.version }}" body: "Automated pull request to merge the release branch into develop." base: "develop" token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file