From c49b4696670cf2a5ec4b90317014690fe6a3a755 Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 11:35:57 +0100 Subject: [PATCH 1/7] feat: add github action to fork sync --- .../workflows/actions/fork-sync/action.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/actions/fork-sync/action.yml diff --git a/.github/workflows/actions/fork-sync/action.yml b/.github/workflows/actions/fork-sync/action.yml new file mode 100644 index 00000000000..b60699b170c --- /dev/null +++ b/.github/workflows/actions/fork-sync/action.yml @@ -0,0 +1,19 @@ +name: Sync Fork + +on: + schedule: + - cron: '*/30 * * * *' # every 30 minutes + workflow_dispatch: # on button click + +jobs: + sync: + runs-on: ubuntu-latest + + steps: + - uses: tgymnich/fork-sync@v1.8 + with: + owner: smartive + base: master + head: master + repo: $ionic-team/stencil + pr_title: Fork sync with upstream From 4ed6f4ddfc51f8f2e6a82cdd13bd74cd771b7b65 Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 11:44:03 +0100 Subject: [PATCH 2/7] rename master to main in github action --- .github/workflows/actions/fork-sync/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions/fork-sync/action.yml b/.github/workflows/actions/fork-sync/action.yml index b60699b170c..06147d143a8 100644 --- a/.github/workflows/actions/fork-sync/action.yml +++ b/.github/workflows/actions/fork-sync/action.yml @@ -13,7 +13,7 @@ jobs: - uses: tgymnich/fork-sync@v1.8 with: owner: smartive - base: master - head: master + base: main + head: main repo: $ionic-team/stencil pr_title: Fork sync with upstream From af4e05cc805095a6c102c5df0f42db0fd4d2fa1a Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 11:52:08 +0100 Subject: [PATCH 3/7] github action --- .../workflows/{actions/fork-sync/action.yml => fork-sync.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{actions/fork-sync/action.yml => fork-sync.yml} (95%) diff --git a/.github/workflows/actions/fork-sync/action.yml b/.github/workflows/fork-sync.yml similarity index 95% rename from .github/workflows/actions/fork-sync/action.yml rename to .github/workflows/fork-sync.yml index 06147d143a8..517ed7d6189 100644 --- a/.github/workflows/actions/fork-sync/action.yml +++ b/.github/workflows/fork-sync.yml @@ -1,4 +1,4 @@ -name: Sync Fork +name: Fork Sync on: schedule: From 3991fbf30b13af4941f0a02d2e8e732164e536e8 Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 13:16:45 +0100 Subject: [PATCH 4/7] use newest fork sync version --- .github/workflows/fork-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 517ed7d6189..73434c0040e 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: tgymnich/fork-sync@v1.8 + - uses: tgymnich/fork-sync@v1.9.0 with: owner: smartive base: main From 330d1f0fa9ea4d565488331f7c7ae550e3013be0 Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 13:33:28 +0100 Subject: [PATCH 5/7] cron job every monday and thursday --- .github/workflows/fork-sync.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 73434c0040e..eec445a38a3 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -2,8 +2,10 @@ name: Fork Sync on: schedule: - - cron: '*/30 * * * *' # every 30 minutes - workflow_dispatch: # on button click + - cron: '0 7 * * 1,4' + # scheduled at 07:00 every Monday and Thursday + + workflow_dispatch: # click the button on Github repo! jobs: sync: From 9d1728add386474c56691a463dcaaca06f333df0 Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 13:38:52 +0100 Subject: [PATCH 6/7] add fork-sync to main.yml --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7c5b9533cc..e585dc8e590 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,3 +57,7 @@ jobs: uses: ./.github/workflows/test-unit.yml with: build_name: stencil-core + + fork_sync: + name: Fork Sync + uses: ./.github/workflows/fork-sync.yml From 19b6ac4bf0c184b6902f60c01b8353dddabc8d4a Mon Sep 17 00:00:00 2001 From: Marco Baumgartner Date: Wed, 6 Dec 2023 13:39:52 +0100 Subject: [PATCH 7/7] remove fork sync from main.yml --- .github/workflows/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e585dc8e590..a7c5b9533cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,7 +57,3 @@ jobs: uses: ./.github/workflows/test-unit.yml with: build_name: stencil-core - - fork_sync: - name: Fork Sync - uses: ./.github/workflows/fork-sync.yml