Skip to content

Commit

Permalink
Remove "merge main" configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
jgarber623 committed Apr 19, 2024
1 parent 9abf517 commit d8cbbbd
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,14 @@ on:
push:
branches: [production]
workflow_dispatch:
inputs:
merge-main:
description: Merge main branch
required: false
type: boolean

concurrency:
group: deploy-${{ github.ref }}
cancel-in-progress: true

jobs:
merge-main:
name: Merge main branch
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Merge main branch and push changes
if: ${{ github.event.inputs.merge-main == 'true' }}
run: |
git fetch origin main
git merge origin/main
git push
ci:
name: CI
needs: merge-main
uses: ./.github/workflows/ci.yml
build:
name: Build
Expand Down

0 comments on commit d8cbbbd

Please sign in to comment.