Skip to content

Commit

Permalink
Merge pull request #204 from adobecom/stage
Browse files Browse the repository at this point in the history
[Release] Stage to Main
  • Loading branch information
meganthecoder authored Jun 6, 2024
2 parents 66ed867 + 0dc258d commit d47d376
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 5 deletions.
31 changes: 26 additions & 5 deletions .github/workflows/fg-sync-repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ name: Floodgate Repo Sync

on:
workflow_dispatch:
inputs:
syncBranch:
description: 'Branch to sync'
required: true
default: 'stage'
type: choice
options:
- 'stage'
- 'main'

jobs:
build:
Expand All @@ -17,30 +26,42 @@ jobs:
repositories: "bacom-pink"

- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
persist-credentials: false
ref: ${{ inputs.syncBranch }}

- name: Clone Floodgate Repository
- name: Clone Floodgate Repository and Checkout Selected Branch
run: |
git clone https://github.com/adobecom/bacom-pink.git ../bacom-pink
cd ../bacom-pink
git checkout $FG_SYNC_BRANCH
echo "bacom-pink branch"
git branch
cd ../bacom
echo "bacom branch"
git branch
env:
FG_SYNC_BRANCH: ${{ inputs.syncBranch }}

- name: Overwrite floodgate repo files with latest from source repo
run: |
rsync -av --exclude='fstab.yaml' --exclude='.github' --exclude='.git' --exclude='.idea' --exclude='tools/sidekick/config.json' ./ ../bacom-pink/
rsync -av --exclude='fstab.yaml' --exclude='.github' --exclude='.kodiak' --exclude='.git' --exclude='.idea' --exclude='.husky' --exclude='.vscode' --exclude='tools/sidekick/config.json' ./ ../bacom-pink/
- name: Commit and Push Changes to Floodgate Repository
run: |
cd ../bacom-pink
echo "bacom-pink branch"
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:[email protected]/adobecom/bacom-pink.git
git remote -v
git add .
git commit -m "Syncing bacom to bacom-pink"
git push origin main --force
git push origin $FG_SYNC_BRANCH --force
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 }}
1 change: 1 addition & 0 deletions scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ const CONFIG = {
/business\.adobe\.com\/(\w\w(_\w\w)?\/)?blog(\/.*)?/,
],
useDotHtml: true,
dynamicNavKey: 'bacom',
};

const eagerLoad = (img) => {
Expand Down
11 changes: 11 additions & 0 deletions tools/sidekick/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
"project": "BACOM",
"host": "business.adobe.com",
"plugins": [
{
"id": "path",
"title": "Path",
"environments": [ "edit" ],
"url": "https://milo.adobe.com/tools/path-finder",
"isPalette": true,
"passReferrer": true,
"passConfig": true,
"paletteRect": "top: 50%; left: 50%; transform: translate(-50%,-50%); height: 84px; width: 900px; overflow: hidden; border-radius: 6px; box-shadow: 0 20px 35px 0px rgba(0, 0, 0, 0.5);",
"includePaths": [ "**.docx**", "**.xlsx**" ]
},
{
"id": "library",
"title": "Library",
Expand Down

0 comments on commit d47d376

Please sign in to comment.