Skip to content

Commit

Permalink
[Release] Stage to Main (#2648)
Browse files Browse the repository at this point in the history
  • Loading branch information
milo-pr-merge[bot] authored Jul 31, 2024
2 parents 0073337 + 8232146 commit c3371ce
Show file tree
Hide file tree
Showing 230 changed files with 47,102 additions and 2,237 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
],
ignorePatterns: [
'/libs/deps/*',
'/libs/features/mas/*',
'/tools/loc/*',
'/libs/features/spectrum-web-components/*',
],
Expand Down
27 changes: 18 additions & 9 deletions .github/workflows/fg-sync-repos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Floodgate Repo Sync

on:
push:
branches:
- stage
- main
workflow_dispatch:
inputs:
syncBranch:
Expand Down Expand Up @@ -29,7 +33,7 @@ jobs:
uses: actions/checkout@v4
with:
persist-credentials: false
ref: ${{ inputs.syncBranch }}
ref: ${{ inputs.syncBranch || github.ref_name }}

- name: Clone Floodgate Repository and Checkout Selected Branch
run: |
Expand All @@ -42,7 +46,7 @@ jobs:
echo "milo 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: |
Expand All @@ -55,14 +59,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/milo-pink.git
git remote -v
git add .
git commit -m "Syncing milo to milo-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/milo-pink.git
git remote -v
git add .
git commit -m "Syncing milo to milo-pink"
git push origin $FG_SYNC_BRANCH --force
echo ":heavy_check_mark: Syncing branch $FG_SYNC_BRANCH on milo to milo-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 }}
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.hlx/*
.aem/*
coverage/*
coverage
logs/*
node_modules/*
node_modules
.DS_Store
.idea
.iml
.env
**/mas/stats.json
1 change: 1 addition & 0 deletions .hlxignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ build/*
LICENSE
web-test-runner.config.mjs
codecov.yaml
libs/features/mas/*
36 changes: 0 additions & 36 deletions libs/blocks/bulk-publish/README.md

This file was deleted.

Loading

0 comments on commit c3371ce

Please sign in to comment.