Skip to content

Commit

Permalink
merge(#47): fix: setup basic checkout and add explicit registry-url
Browse files Browse the repository at this point in the history
fix: setup basic checkout and add explicit registry-url
  • Loading branch information
403-html committed Feb 16, 2024
2 parents b651ea3 + a2cd4a5 commit addb464
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/pr-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,20 @@ jobs:
outputs:
version: ${{ steps.get-version.outputs.version }}
steps:
- name: Reattach HEAD
- name: Checkout code for PR
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0

- name: Checkout code for release push
if: github.event_name == 'push'
uses: actions/checkout@v2
with:
ref: main
fetch-depth: 0

- name: Merge main branch to PR branch
if: github.event_name == 'pull_request'
uses: pr-mpt/actions-merge-branch@v2
Expand Down Expand Up @@ -129,6 +137,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '18'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
run: npm install
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.3",
"version": "1.3.4",
"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 addb464

Please sign in to comment.