From eb5f53b396ac9965e023dcf337b2e4cd82c30fed Mon Sep 17 00:00:00 2001 From: Zack Koppert Date: Tue, 7 Feb 2023 20:49:18 -0800 Subject: [PATCH 1/4] Create sync.yaml --- .github/workflows/sync.yaml | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/sync.yaml diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml new file mode 100644 index 000000000000..e2afca367d0e --- /dev/null +++ b/.github/workflows/sync.yaml @@ -0,0 +1,44 @@ +name: 'Upstream Sync' + +on: + schedule: + - cron: '0 21 * * 1-6' + + workflow_dispatch: # click the button on Github repo! + +jobs: + sync_latest_from_upstream: + runs-on: ubuntu-latest + name: Sync latest commits from upstream repo + + steps: + # REQUIRED step + # Step 1: run a standard checkout action, provided by github + - name: Checkout target repo + uses: actions/checkout@v3 + with: + ref: master + + # REQUIRED step + # Step 2: run the sync action + - name: Sync upstream changes + id: sync + uses: aormsby/Fork-Sync-With-Upstream-action@v3.4 + with: + target_sync_branch: master + # REQUIRED 'target_repo_token' exactly like this! + target_repo_token: ${{ secrets.GITHUB_TOKEN }} + upstream_sync_branch: master + upstream_sync_repo: clearlydefined/curated-data + + # Step 3: Display a sample message based on the sync output var 'has_new_commits' + - name: New commits found + if: steps.sync.outputs.has_new_commits == 'true' + run: echo "New commits were found to sync." + + - name: No new commits + if: steps.sync.outputs.has_new_commits == 'false' + run: echo "There were no new commits." + + - name: Show value of 'has_new_commits' + run: echo ${{ steps.sync.outputs.has_new_commits }} From a97533ff5a598e2e358e739d29d4c5bd5d298472 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:37:24 +0000 Subject: [PATCH 2/4] Bump minimatch from 3.0.4 to 3.1.2 Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index edafb7a9bede..5321f3af4354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,9 +78,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } From 285fc40b3060711b4cf123b5756e8781e0a497b5 Mon Sep 17 00:00:00 2001 From: Zack Koppert Date: Sat, 30 Sep 2023 07:57:05 -0700 Subject: [PATCH 3/4] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index becdd068addb..8451d0d6f8eb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ -# curated-data - -This repository contains curation patches for clearlydefined.io. \ No newline at end of file +This branch `main` only contains the github action to keep the `master` branch in sync with the upstream `clearlydefined/curated-data`. From e4fade987487ca0a9e40b2166275bd95df3a9639 Mon Sep 17 00:00:00 2001 From: Zack Koppert Date: Mon, 8 Jul 2024 16:44:52 -0700 Subject: [PATCH 4/4] Update sync.yaml --- .github/workflows/sync.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index e2afca367d0e..bb44ae957fad 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -8,6 +8,8 @@ on: jobs: sync_latest_from_upstream: + permissions: + contents: write runs-on: ubuntu-latest name: Sync latest commits from upstream repo @@ -15,7 +17,7 @@ jobs: # REQUIRED step # Step 1: run a standard checkout action, provided by github - name: Checkout target repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: master