Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Sync main to flyio-new-files
name: Sync main to deploy

on:
pull_request:
Expand All @@ -24,16 +24,16 @@ jobs:

- name: Save fly.toml from deploy branch
run: |
git fetch origin flyio-new-files || echo "No deploy branch yet"
git fetch origin deploy || echo "No deploy branch yet"
mkdir temp
if git ls-remote --exit-code origin flyio-new-files; then
git checkout origin/flyio-new-files -- fly.toml || echo "No fly.toml to copy"
if git ls-remote --exit-code origin deploy; then
git checkout origin/deploy -- fly.toml || echo "No fly.toml to copy"
cp fly.toml temp/ || echo "No fly.toml found to copy"
fi

- name: Create/overwrite flyio-new-files branch
- name: Create/overwrite deploy branch
run: |
git checkout -B flyio-new-files
git checkout -B deploy
git reset --hard main

- name: Restore fly.toml
Expand All @@ -42,10 +42,10 @@ jobs:
cp temp/fly.toml fly.toml
fi

- name: Commit and push to flyio-new-files
- name: Commit and push to deploy
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git add -A
git commit -m "Sync main -> flyio-new-files (keeping fly.toml)" || echo "No changes to commit"
git push -f origin flyio-new-files
git commit -m "Sync main -> deploy (keeping fly.toml)" || echo "No changes to commit"
git push -f origin deploy