Skip to content

Commit

Permalink
Update main to master
Browse files Browse the repository at this point in the history
  • Loading branch information
lowlighter committed May 15, 2021
1 parent 6b129ab commit aabb21f
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,28 @@ jobs:
- name: Publish rebuild metrics indexes
run: npm run index -- publish

# Rebase main branch on master
update-main:
name: Rebase main on master
runs-on: ubuntu-latest
needs: [ update-indexes ]
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup NodeJS
uses: actions/setup-node@v2
with:
node-version: 15
- name: Checkout main
run: git checkout main
- name: Rebase main on master
run: git merge master
- name: Push main
run: git push origin main

# Build docker image from master and publish it to GitHub registry
docker-master:
name: Publish master to GitHub registry
Expand Down

0 comments on commit aabb21f

Please sign in to comment.