Skip to content

Commit 809159a

Browse files
Merge branch 'develop' into publish-npm-from-branch
2 parents 3ea016f + e196db3 commit 809159a

File tree

14 files changed

+123
-118
lines changed

14 files changed

+123
-118
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20-
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
20+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
2121
with:
2222
cache: 'npm'
2323
node-version-file: '.nvmrc'

.github/workflows/publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Publish
32

43
on:

.github/workflows/signature-assistant.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
issue_comment:
44
types: [created]
55
pull_request_target:
6-
types: [opened,closed,synchronize]
6+
types: [opened, closed, synchronize]
77

88
permissions:
99
actions: write
@@ -13,19 +13,25 @@ permissions:
1313

1414
jobs:
1515
CLA-Assistant:
16+
if: github.event_name == 'pull_request_target' ||
17+
(
18+
github.event.comment.body == 'recheck' ||
19+
github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA'
20+
)
1621
runs-on: ubuntu-latest
1722
steps:
23+
- uses: scratchfoundation/scratch-agreements/.github/actions/cla-allowlist@main
24+
id: cla-allowlist
1825
- name: "CLA Assistant"
19-
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
2026
uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
2127
env:
2228
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2329
# the below token should have repo scope and must be manually added by you in the repository's secrets
2430
PERSONAL_ACCESS_TOKEN: ${{ secrets.GHA_AGREEMENTS_PAT }}
2531
with:
26-
remote-organization-name: 'scratchfoundation'
27-
remote-repository-name: 'scratch-agreements'
28-
path-to-signatures: 'signatures/version1/cla.json'
29-
path-to-document: 'https://github.com/scratchfoundation/scratch-agreements/blob/main/CLA.md'
30-
branch: 'main'
31-
allowlist: semantic-release-bot,*[bot]
32+
remote-organization-name: "scratchfoundation"
33+
remote-repository-name: "scratch-agreements"
34+
path-to-signatures: "signatures/version1/cla.json"
35+
path-to-document: "https://github.com/scratchfoundation/scratch-agreements/blob/main/CLA.md"
36+
branch: "main"
37+
allowlist: ${{ steps.cla-allowlist.outputs.allowlist }}

.github/workflows/update-i18n.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20-
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
20+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
2121
with:
2222
cache: 'npm'
2323
node-version-file: '.nvmrc'

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.18.3
1+
20.19.0

0 commit comments

Comments
 (0)