Skip to content

Commit

Permalink
merge(#44): fix: fix the ifology to fit properly on merge
Browse files Browse the repository at this point in the history
fix: fix the ifology to fit properly on merge
  • Loading branch information
403-html committed Feb 16, 2024
2 parents 3241c7e + 388a321 commit 27f7dd6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/pr-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}"
Expand All @@ -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
Expand All @@ -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 .
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit 27f7dd6

Please sign in to comment.