From 87d16ae3a570b6ece2a60ac4b6ed0dec691f11c0 Mon Sep 17 00:00:00 2001 From: 403-html Date: Fri, 16 Feb 2024 18:33:13 +0100 Subject: [PATCH 1/2] fix: fix the ifology to fit properly on merge --- .github/workflows/pr-workflow.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml index bdb08f3..2c4ca9b 100644 --- a/.github/workflows/pr-workflow.yml +++ b/.github/workflows/pr-workflow.yml @@ -11,7 +11,6 @@ on: jobs: semver-check: - if: github.event_name == 'pull_request' runs-on: ubuntu-latest outputs: version: ${{ steps.get-version.outputs.version }} @@ -23,15 +22,18 @@ jobs: fetch-depth: 0 - name: Merge main branch to PR branch + if: github.event_name == 'pull_request' uses: pr-mpt/actions-merge-branch@v2 with: from: "origin/main" - name: Get current prefix + if: github.event_name == 'pull_request' id: branch-prefix run: echo "::set-output name=prefix::$(echo ${{ github.head_ref }} | cut -d '/' -f 1)" - name: Check if branch prefix is valid (major, minor, patch) + if: github.event_name == 'pull_request' run: | echo "Checking branch prefix..." echo "branch prefix: ${{ steps.branch-prefix.outputs.prefix }}" @@ -42,6 +44,7 @@ jobs: echo "Branch prefix is valid" - name: Set next version number based on prefix + if: github.event_name == 'pull_request' run: | echo "Getting next version number..." if [ "${{ steps.branch-prefix.outputs.prefix }}" == "major" ]; then @@ -59,16 +62,19 @@ jobs: fi - name: Get version number + if: github.event_name == 'push' id: get-version run: echo "::set-output name=version::$(git describe --tags --abbrev=0)" - name: Setup git + if: github.event_name == 'pull_request' run: | echo "Setting up git..." git config --global user.email "${{ secrets.MY_EMAIL }}" git config --global user.name "${{ secrets.MY_USERNAME }}" - name: Commit and push changes to working branch + if: github.event_name == 'pull_request' run: | echo "Committing changes..." git add . @@ -111,7 +117,6 @@ jobs: if: github.event_name == 'push' && github.ref == 'refs/heads/main' runs-on: ubuntu-latest needs: - - semver-check - gh-release steps: - name: Set up Node.js From 388a321ac8feb678e75eb16223c99b7c48999194 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:33:55 +0000 Subject: [PATCH 2/2] chore(release): Bump patch version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b225d77..0299853 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mochawesome-json-to-md", - "version": "1.3.1", + "version": "1.3.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mochawesome-json-to-md", - "version": "1.3.1", + "version": "1.3.2", "license": "MIT", "dependencies": { "commander": "^11.1.0", diff --git a/package.json b/package.json index b6b46af..7d830ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mochawesome-json-to-md", - "version": "1.3.1", + "version": "1.3.2", "description": "A repository containing a script to convert JSON reports generated by MochAwesome to Mardown", "main": "index.js", "bin": {