From 586d91222ce5b6270f68d3fd0dfe1033bd77e4c6 Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Tue, 19 Nov 2024 15:13:28 +0200 Subject: [PATCH 01/12] Create bunnyshell-sync-fork-2.0.yaml --- .../workflows/bunnyshell-sync-fork-2.0.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/bunnyshell-sync-fork-2.0.yaml diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml new file mode 100644 index 00000000000..ba6f5f0c8f4 --- /dev/null +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -0,0 +1,54 @@ +name: Sync Fork 2.0 + +on: + schedule: + - cron: '0 0 * * *' # at midnight + workflow_dispatch: # on button click + +jobs: + sync-and-tweak: + runs-on: ubuntu-latest + env: + BNS_GIT_DEST_REPO_URL: 'https://github.com/bunnyshell/OSS-Sylius.git' + BNS_GIT_DEST_REPO_NAME: 'bunnyshell/OSS-Sylius' + BNS_GIT_DEST_BRANCH: '2.0-bns' + BNS_GIT_FOLLOW_BRANCH: '2.0' + BNS_YAML_PATH: '.bunnyshell/templates/preview/bunnyshell.yaml' + + steps: + - name: Sync branch with wpstream + env: + GH_TOKEN: ${{ github.token }} + run: | + gh repo sync ${BNS_GIT_DEST_REPO_NAME} --branch ${BNS_GIT_FOLLOW_BRANCH} --force + + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 1 # Fetch shallow history for efficiency + ref: ${BNS_GIT_FOLLOW_BRANCH} + + - name: Set config user + run: | + git config --global user.email "devops@bunnyshell.com" + git config --global user.name "Bunnyshell" + + - name: Checkout to dest branch + run: | + git checkout --force -B ${BNS_GIT_DEST_BRANCH} refs/remotes/origin/${BNS_GIT_DEST_BRANCH} + git rebase ${BNS_GIT_FOLLOW_BRANCH} -X ours || (git rebase --abort && exit 1) + + - name: Setup yq + uses: frenck/action-setup-yq@v1 + + - name: Update bunnyshell.yaml file + run: | + yq "(.components[] | select(.gitRepo != null)).gitRepo |= \"$BNS_GIT_DEST_REPO_URL\"" $BNS_YAML_PATH > $BNS_YAML_PATH-tmp + mv $BNS_YAML_PATH-tmp $BNS_YAML_PATH + yq "(.components[] | select(.gitBranch != null)).gitBranch |= \"$BNS_GIT_DEST_BRANCH\"" $BNS_YAML_PATH > $BNS_YAML_PATH-tmp + mv $BNS_YAML_PATH-tmp $BNS_YAML_PATH + git add $BNS_YAML_PATH + git commit -m "Update bunnyshell.yaml" || echo "No changes to commit" + + - name: Push Updates to dest branch + run: git push origin ${BNS_GIT_DEST_BRANCH} --force From 1f625b470386a7b4b80f6a582e0bad627e7468ad Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Tue, 19 Nov 2024 15:20:56 +0200 Subject: [PATCH 02/12] Update bunnyshell-sync-fork-2.0.yaml --- .github/workflows/bunnyshell-sync-fork-2.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index ba6f5f0c8f4..20a818408ef 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -1,4 +1,4 @@ -name: Sync Fork 2.0 +name: Bunnyshell - Sync Fork 2.0 on: schedule: @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 1 # Fetch shallow history for efficiency - ref: ${BNS_GIT_FOLLOW_BRANCH} + ref: ${{ env.BNS_GIT_FOLLOW_BRANCH }} - name: Set config user run: | From 227f50afeb0ac986b0bdb4643143bd089b11c8ba Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Tue, 19 Nov 2024 15:49:24 +0200 Subject: [PATCH 03/12] Update bunnyshell-sync-fork-2.0.yaml --- .../workflows/bunnyshell-sync-fork-2.0.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index 20a818408ef..9b47365333a 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -16,32 +16,49 @@ jobs: BNS_YAML_PATH: '.bunnyshell/templates/preview/bunnyshell.yaml' steps: - - name: Sync branch with wpstream + - name: Sync branch with upstream env: GH_TOKEN: ${{ github.token }} run: | + # this works because BNS_GIT_FOLLOW_BRANCH is the default branch + PRE_SYNC_COMMIT=$(git rev-parse HEAD) gh repo sync ${BNS_GIT_DEST_REPO_NAME} --branch ${BNS_GIT_FOLLOW_BRANCH} --force + POST_SYNC_COMMIT=$(git rev-parse HEAD) + if [ "$PRE_SYNC_COMMIT" = "$POST_SYNC_COMMIT" ]; then + echo "CHANGES_DETECTED=false" >> $GITHUB_ENV + else + echo "CHANGES_DETECTED=true" >> $GITHUB_ENV + fi + + - name: Stop Workflow If No Changes + if: env.CHANGES_DETECTED == 'false' + run: echo "No updates detected. Workflow stopping here." - name: Checkout repository + if: env.CHANGES_DETECTED == 'true' uses: actions/checkout@v4 with: fetch-depth: 1 # Fetch shallow history for efficiency ref: ${{ env.BNS_GIT_FOLLOW_BRANCH }} - name: Set config user + if: env.CHANGES_DETECTED == 'true' run: | git config --global user.email "devops@bunnyshell.com" git config --global user.name "Bunnyshell" - name: Checkout to dest branch + if: env.CHANGES_DETECTED == 'true' run: | git checkout --force -B ${BNS_GIT_DEST_BRANCH} refs/remotes/origin/${BNS_GIT_DEST_BRANCH} git rebase ${BNS_GIT_FOLLOW_BRANCH} -X ours || (git rebase --abort && exit 1) - name: Setup yq + if: env.CHANGES_DETECTED == 'true' uses: frenck/action-setup-yq@v1 - name: Update bunnyshell.yaml file + if: env.CHANGES_DETECTED == 'true' run: | yq "(.components[] | select(.gitRepo != null)).gitRepo |= \"$BNS_GIT_DEST_REPO_URL\"" $BNS_YAML_PATH > $BNS_YAML_PATH-tmp mv $BNS_YAML_PATH-tmp $BNS_YAML_PATH @@ -51,4 +68,5 @@ jobs: git commit -m "Update bunnyshell.yaml" || echo "No changes to commit" - name: Push Updates to dest branch + if: env.CHANGES_DETECTED == 'true' run: git push origin ${BNS_GIT_DEST_BRANCH} --force From 02556efacd3166d7196160008e163bf3cf8bff80 Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Tue, 19 Nov 2024 16:02:31 +0200 Subject: [PATCH 04/12] Update bunnyshell-sync-fork-2.0.yaml --- .github/workflows/bunnyshell-sync-fork-2.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index 9b47365333a..d83b9b257bf 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -21,9 +21,9 @@ jobs: GH_TOKEN: ${{ github.token }} run: | # this works because BNS_GIT_FOLLOW_BRANCH is the default branch - PRE_SYNC_COMMIT=$(git rev-parse HEAD) + PRE_SYNC_COMMIT=$(gh api repos/${BNS_GIT_DEST_REPO_NAME}/commits/${BNS_GIT_FOLLOW_BRANCH} --jq '.sha') gh repo sync ${BNS_GIT_DEST_REPO_NAME} --branch ${BNS_GIT_FOLLOW_BRANCH} --force - POST_SYNC_COMMIT=$(git rev-parse HEAD) + POST_SYNC_COMMIT=$(gh api repos/${BNS_GIT_DEST_REPO_NAME}/commits/${BNS_GIT_FOLLOW_BRANCH} --jq '.sha') if [ "$PRE_SYNC_COMMIT" = "$POST_SYNC_COMMIT" ]; then echo "CHANGES_DETECTED=false" >> $GITHUB_ENV else From 3ed00e50fb911f20f82c5099c0a6aac5b6cdaf17 Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Tue, 19 Nov 2024 18:07:40 +0200 Subject: [PATCH 05/12] Update bunnyshell-sync-fork-2.0.yaml --- .github/workflows/bunnyshell-sync-fork-2.0.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index d83b9b257bf..8696d686a5b 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -64,6 +64,7 @@ jobs: mv $BNS_YAML_PATH-tmp $BNS_YAML_PATH yq "(.components[] | select(.gitBranch != null)).gitBranch |= \"$BNS_GIT_DEST_BRANCH\"" $BNS_YAML_PATH > $BNS_YAML_PATH-tmp mv $BNS_YAML_PATH-tmp $BNS_YAML_PATH + yq "del(.components[].dockerCompose.cap_add)" -i $BNS_YAML_PATH git add $BNS_YAML_PATH git commit -m "Update bunnyshell.yaml" || echo "No changes to commit" From cb1be57f4575f17f83c91b9007c2ad6e95e6b85d Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Tue, 19 Nov 2024 18:16:26 +0200 Subject: [PATCH 06/12] Update bunnyshell-sync-fork-2.0.yaml --- .../workflows/bunnyshell-sync-fork-2.0.yaml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index 8696d686a5b..b780071a5c9 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -4,6 +4,11 @@ on: schedule: - cron: '0 0 * * *' # at midnight workflow_dispatch: # on button click + inputs: + force_update: + description: "Force the update even if nothing changed" + required: false + default: "false" jobs: sync-and-tweak: @@ -31,34 +36,34 @@ jobs: fi - name: Stop Workflow If No Changes - if: env.CHANGES_DETECTED == 'false' + if: env.CHANGES_DETECTED == 'false' && inputs.force_update != 'true' run: echo "No updates detected. Workflow stopping here." - name: Checkout repository - if: env.CHANGES_DETECTED == 'true' + if: env.CHANGES_DETECTED == 'true' || inputs.force_update == 'true' uses: actions/checkout@v4 with: fetch-depth: 1 # Fetch shallow history for efficiency ref: ${{ env.BNS_GIT_FOLLOW_BRANCH }} - name: Set config user - if: env.CHANGES_DETECTED == 'true' + if: env.CHANGES_DETECTED == 'true' || inputs.force_update == 'true' run: | git config --global user.email "devops@bunnyshell.com" git config --global user.name "Bunnyshell" - name: Checkout to dest branch - if: env.CHANGES_DETECTED == 'true' + if: env.CHANGES_DETECTED == 'true' || inputs.force_update == 'true' run: | git checkout --force -B ${BNS_GIT_DEST_BRANCH} refs/remotes/origin/${BNS_GIT_DEST_BRANCH} git rebase ${BNS_GIT_FOLLOW_BRANCH} -X ours || (git rebase --abort && exit 1) - name: Setup yq - if: env.CHANGES_DETECTED == 'true' + if: env.CHANGES_DETECTED == 'true' || inputs.force_update == 'true' uses: frenck/action-setup-yq@v1 - name: Update bunnyshell.yaml file - if: env.CHANGES_DETECTED == 'true' + if: env.CHANGES_DETECTED == 'true' || inputs.force_update == 'true' run: | yq "(.components[] | select(.gitRepo != null)).gitRepo |= \"$BNS_GIT_DEST_REPO_URL\"" $BNS_YAML_PATH > $BNS_YAML_PATH-tmp mv $BNS_YAML_PATH-tmp $BNS_YAML_PATH @@ -69,5 +74,5 @@ jobs: git commit -m "Update bunnyshell.yaml" || echo "No changes to commit" - name: Push Updates to dest branch - if: env.CHANGES_DETECTED == 'true' + if: env.CHANGES_DETECTED == 'true' || inputs.force_update == 'true' run: git push origin ${BNS_GIT_DEST_BRANCH} --force From af529495d11d500a92384ceaec643ba90723f0d2 Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Thu, 21 Nov 2024 10:26:40 +0200 Subject: [PATCH 07/12] Update bunnyshell-sync-fork-2.0.yaml --- .github/workflows/bunnyshell-sync-fork-2.0.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index b780071a5c9..31c09e1cad8 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -10,6 +10,9 @@ on: required: false default: "false" +permissions: + contents: write + jobs: sync-and-tweak: runs-on: ubuntu-latest From 5834400a5b6aa18d6328f185808029e47e501905 Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Thu, 21 Nov 2024 10:43:32 +0200 Subject: [PATCH 08/12] Update bunnyshell-sync-fork-2.0.yaml --- .github/workflows/bunnyshell-sync-fork-2.0.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index 31c09e1cad8..0d22c24f292 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -10,9 +10,6 @@ on: required: false default: "false" -permissions: - contents: write - jobs: sync-and-tweak: runs-on: ubuntu-latest @@ -26,7 +23,7 @@ jobs: steps: - name: Sync branch with upstream env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.GH_SYNC_PAT }} run: | # this works because BNS_GIT_FOLLOW_BRANCH is the default branch PRE_SYNC_COMMIT=$(gh api repos/${BNS_GIT_DEST_REPO_NAME}/commits/${BNS_GIT_FOLLOW_BRANCH} --jq '.sha') From 3adcaf37bbe55e8093401e6b9deb03091e7147e3 Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Thu, 6 Feb 2025 13:34:30 +0200 Subject: [PATCH 09/12] Update bunnyshell-sync-fork-2.0.yaml --- .github/workflows/bunnyshell-sync-fork-2.0.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bunnyshell-sync-fork-2.0.yaml b/.github/workflows/bunnyshell-sync-fork-2.0.yaml index 0d22c24f292..1a4d75a32a6 100644 --- a/.github/workflows/bunnyshell-sync-fork-2.0.yaml +++ b/.github/workflows/bunnyshell-sync-fork-2.0.yaml @@ -25,6 +25,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GH_SYNC_PAT }} run: | + gh --version # this works because BNS_GIT_FOLLOW_BRANCH is the default branch PRE_SYNC_COMMIT=$(gh api repos/${BNS_GIT_DEST_REPO_NAME}/commits/${BNS_GIT_FOLLOW_BRANCH} --jq '.sha') gh repo sync ${BNS_GIT_DEST_REPO_NAME} --branch ${BNS_GIT_FOLLOW_BRANCH} --force From 3c959c8820e91ebf8ab8149cc86312a55bc66c6f Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Thu, 6 Feb 2025 14:03:02 +0200 Subject: [PATCH 10/12] Test Update copy.html.twig test --- .../templates/shared/layout/base/footer/content/copy.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig b/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig index 8835d1784d4..caec1fb73e8 100644 --- a/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig +++ b/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig @@ -7,6 +7,6 @@
© {{ 'sylius.ui.your_store'|trans }}, {{ 'sylius.ui.powered_by'|trans }} - Sylius + Sylius Test PR
From 7c5d09d7310f2ed772fda42b2aa9539ccc00cdcc Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Mon, 9 Feb 2026 17:19:45 +0200 Subject: [PATCH 11/12] Update copy.html.twig --- .../templates/shared/layout/base/footer/content/copy.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig b/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig index caec1fb73e8..f9c4ff8c112 100644 --- a/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig +++ b/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig @@ -7,6 +7,6 @@
© {{ 'sylius.ui.your_store'|trans }}, {{ 'sylius.ui.powered_by'|trans }} - Sylius Test PR + Sylius Test PR rr
From 2b1ab5353d17778de574143ad38a48def322c4aa Mon Sep 17 00:00:00 2001 From: mihaichitic Date: Mon, 9 Feb 2026 17:27:42 +0200 Subject: [PATCH 12/12] Update copy.html.twig --- .../templates/shared/layout/base/footer/content/copy.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig b/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig index f9c4ff8c112..216a1c75dc2 100644 --- a/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig +++ b/src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/copy.html.twig @@ -7,6 +7,6 @@
© {{ 'sylius.ui.your_store'|trans }}, {{ 'sylius.ui.powered_by'|trans }} - Sylius Test PR rr + Sylius Test PR rrr