diff --git a/.github/workflows/fg-sync-repos.yml b/.github/workflows/fg-sync-repos.yml index afd55ab..6f0e696 100644 --- a/.github/workflows/fg-sync-repos.yml +++ b/.github/workflows/fg-sync-repos.yml @@ -1,6 +1,10 @@ name: Floodgate Repo Sync on: + push: + branches: + - stage + - main workflow_dispatch: inputs: syncBranch: @@ -28,7 +32,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 with: - ref: ${{ inputs.syncBranch }} + ref: ${{ inputs.syncBranch || github.ref_name }} - name: Clone Floodgate Repository and Checkout Selected Branch run: | @@ -41,7 +45,7 @@ jobs: echo "bacom-blog branch" git branch env: - FG_SYNC_BRANCH: ${{ inputs.syncBranch }} + FG_SYNC_BRANCH: ${{ inputs.syncBranch || github.ref_name }} - name: Overwrite floodgate repo files with latest from source repo run: | @@ -54,14 +58,19 @@ jobs: git branch git config user.email "$FG_SYNC_BOT_EMAIL" git config user.name "$FG_SYNC_BOT_NAME" - git status - git remote set-url origin https://oauth2:$GITHUB_TOKEN@github.com/adobecom/bacom-blog-pink.git - git remote -v - git add . - git commit -m "Syncing bacom-blog to bacom-blog-pink" - git push origin $FG_SYNC_BRANCH --force + git status + if [[ -n $(git status -s) ]]; then + git remote set-url origin https://oauth2:$GITHUB_TOKEN@github.com/adobecom/bacom-blog-pink.git + git remote -v + git add . + git commit -m "Syncing bacom-blog to bacom-blog-pink" + git push origin $FG_SYNC_BRANCH --force + echo ":heavy_check_mark: Syncing branch $FG_SYNC_BRANCH on bacom-blog to bacom-blog-pink completed successfully." >> $GITHUB_STEP_SUMMARY + else + echo ":heavy_minus_sign: No changes detected on branch $FG_SYNC_BRANCH, nothing to sync." >> $GITHUB_STEP_SUMMARY + fi env: GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} FG_SYNC_BOT_EMAIL: ${{ secrets.FG_SYNC_BOT_EMAIL }} FG_SYNC_BOT_NAME: ${{ secrets.FG_SYNC_BOT_NAME }} - FG_SYNC_BRANCH: ${{ inputs.syncBranch }} + FG_SYNC_BRANCH: ${{ inputs.syncBranch || github.ref_name }} diff --git a/.gitignore b/.gitignore index e639ba0..118f024 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ logs/* node_modules/* .DS_Store .idea +*.env diff --git a/tools/sidekick/config.json b/tools/sidekick/config.json index 7cca55f..e6b8a47 100644 --- a/tools/sidekick/config.json +++ b/tools/sidekick/config.json @@ -93,6 +93,13 @@ "url": "https://main--bacom-blog--adobecom.hlx.live/tools/tag-selector", "isPalette": true, "paletteRect": "top: 150px; left: 7%; height: 675px; width: 85vw;" + }, + { + "containerId": "tools", + "id": "bulk", + "title": "Bulk operations", + "environments": [ "edit", "dev", "preview", "live" ], + "url": "https://main--bacom-blog--adobecom.hlx.page/tools/bulk" } ] }