Skip to content

Commit

Permalink
Merge branch 'main' into generates_main_code
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshMock authored Aug 19, 2024
2 parents 32ab4b4 + 1042a02 commit 034b04a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
merge-method: squash
do-not-merge-labels: never-merge
pull-request-author-associations: OWNER
pull-request-author-associations: OWNER,MEMBER,COLLABORATOR
review-author-associations: OWNER,MEMBER
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
src-only: "${{ steps.changes.outputs.src-only }}"
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter/@v2.11.1
- uses: dorny/paths-filter/@v3.0.2
id: changes
with:
filters: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "20.x"
node-version: "22.x"
registry-url: "https://registry.npmjs.org"
- run: npm install -g npm
- run: npm install
Expand Down

0 comments on commit 034b04a

Please sign in to comment.