Skip to content
This repository has been archived by the owner on Nov 15, 2024. It is now read-only.

Commit

Permalink
Merge main into dependabot/npm_and_yarn/browserify-sign-4.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Nov 15, 2024
2 parents f4ab5be + c704373 commit 68274f9
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Security
<!---
Tag *@RenoFi/security* in this PR if any of the following are true:
Tag this PR with *security* label, if any of the following are true:
- [ ] This PR introduces a NEW third party dependency
- [ ] Contains authentication or authorization checks as part of the code
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: Auto approve dependency upgrades and hot-fix PRs
on:
pull_request_target:
types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]

types:
- labeled
- ready_for_review
jobs:
auto-approve:
runs-on: ubuntu-latest
steps:
- uses: hmarr/auto-approve-action@v3
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'self-approve') || contains(github.event.pull_request.labels.*.name, 'dependencies')
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
24 changes: 0 additions & 24 deletions .github/workflows/auto-merge-dependencies.yml

This file was deleted.

17 changes: 13 additions & 4 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
name: automerge
on:
pull_request_target:
types:
- labeled
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
label:
types:
- created
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: pascalgn/[email protected]
uses: pascalgn/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: squash
MERGE_DELETE_BRANCH: true
MERGE_LABELS: "automerge,!automerge blocked"
- name: automerge-dependencies
uses: pascalgn/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: squash
MERGE_DELETE_BRANCH: true
MERGE_LABELS: "dependencies,!automerge blocked"
MERGE_REMOVE_LABELS: ""
24 changes: 11 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@ on:
branches: [ main ]

jobs:
build:

ci_tests_node:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 16.x]

node-version: ['14.x', '16.x']
name: Node ${{ matrix.node-version }}
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm test
- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm test
17 changes: 17 additions & 0 deletions .github/workflows/slack-messages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: post-slack-message
on:
pull_request_target:
types:
- labeled
jobs:
post-slack-message:
runs-on: ubuntu-latest
steps:
- name: Post a slack message when PR contains security changes
uses: slackapi/[email protected]
if: github.event.label.name == 'security'
with:
channel-id: 'C026ZFU7H4K' # latacora slack channel
slack-message: "Pull Request with security changes: ${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

0 comments on commit 68274f9

Please sign in to comment.