Compare commits

...

20 Commits

Author SHA1 Message Date
github-actions[bot] 21213e825c Empty commit to open PR 2026-03-09 00:45:24 +00:00
github-actions[bot] 5b46420b3f Merge upstream:main 2026-03-09 00:45:24 +00:00
Lewis Jones 374343effe Merge pull request #6 from actions/weekly-sync-branch-16171136386
Test / test (push) Has been cancelled
Sync Fork with Upstream
2025-07-09 14:49:18 +01:00
github-actions[bot] 5a79ab0fa4 Empty commit to open PR 2025-07-09 13:48:25 +00:00
github-actions[bot] 0c3e582042 Merge upstream:main 2025-07-09 13:48:25 +00:00
Justin Holguín 876b304ec0 Merge pull request #5 from actions/weekly-sync-branch-16062172741
Sync Fork with Upstream
2025-07-03 16:09:54 -07:00
github-actions[bot] 3104f6d51c Empty commit to open PR 2025-07-03 23:08:17 +00:00
github-actions[bot] 5d8c040f29 Merge upstream:main 2025-07-03 23:08:17 +00:00
Lewis Jones 466989c808 Merge pull request #4 from actions/weekly-sync-branch-15774881579
Sync Fork with Upstream
2025-06-20 09:40:55 +01:00
github-actions[bot] 67f3292117 Empty commit to open PR 2025-06-20 08:36:52 +00:00
github-actions[bot] 3f420ae88d Merge upstream:main 2025-06-20 08:36:52 +00:00
Lewis Jones ef571d5a84 Merge pull request #3 from actions/weekly-sync-branch-15680274825
Sync Fork with Upstream
2025-06-16 13:05:03 +01:00
github-actions[bot] 0eb73668fa Empty commit to open PR 2025-06-16 12:04:03 +00:00
github-actions[bot] 7a168cbdc4 Merge upstream:main 2025-06-16 12:04:03 +00:00
Lewis Jones d5fd67e101 Merge pull request #2 from actions/weekly-sync-branch-15612676798
Sync Fork with Upstream
2025-06-12 15:02:36 +01:00
github-actions[bot] 27e6d82755 Empty commit to open PR 2025-06-12 14:01:47 +00:00
github-actions[bot] 3d11e5a0f7 Merge upstream:main 2025-06-12 14:01:47 +00:00
Lewis Jones 51ef6b3995 Merge pull request #1 from actions/ljones140/setup-fork
Setup fork Codeowners and sync
2025-06-10 15:35:24 +01:00
Lewis Jones cfe815dd6d Add fork sync mechanism 2025-06-10 14:51:08 +01:00
Lewis Jones 9db31129a3 update codeowners 2025-06-10 14:50:54 +01:00
4 changed files with 47 additions and 5 deletions
+3 -3
View File
@@ -23,10 +23,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- name: Set Node.js 16.x
uses: actions/setup-node@v6.2.0
uses: actions/setup-node@v4.4.0
with:
node-version: 16.x
@@ -46,7 +46,7 @@ jobs:
id: diff
# If index.js was different than expected, upload the expected version as an artifact
- uses: actions/upload-artifact@v7
- uses: actions/upload-artifact@v4
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
with:
name: dist
+42
View File
@@ -0,0 +1,42 @@
name: Sync Fork with Upstream
on:
schedule:
- cron: '0 0 * * 1' # Runs at midnight UTC every Monday
workflow_dispatch:
permissions:
contents: write
pull-requests: write
jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0
- name: Fetch Upstream Remote
run: |
git remote add upstream https://github.com/advanced-security/component-detection-dependency-submission-action.git
git fetch upstream
- name: Set Git Config
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Create and Push Branch
run: |
git checkout -b weekly-sync-branch-${{ github.run_id }}
git merge upstream/main --no-commit
git reset -- ./.github
git commit -m "Merge upstream:main"
git commit --allow-empty -m "Empty commit to open PR"
git push --set-upstream origin weekly-sync-branch-${{ github.run_id }}
- name: Open Pull Request
run: |
gh repo set-default actions/component-detection-dependency-submission-action
gh pr create -B main -H weekly-sync-branch-${{ github.run_id }} --title 'Sync Fork with Upstream' --body 'Weekly Cron. Created by GitHub Actions.'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- name: Unit test
run: |
npm install
+1 -1
View File
@@ -1 +1 @@
* @advanced-security/advanced-security-dependency-graph @advanced-security/oss-maintainers
* @advanced-security/advanced-security-dependency-graph