Skip to content

Commit

Permalink
fixed run condition
Browse files Browse the repository at this point in the history
  • Loading branch information
Leo-Nicolle committed Feb 15, 2024
1 parent 7b6af16 commit 643e0ea
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ name: Deploy
on:
pull_request:
types: [closed]
merged: true
branches:
- master

jobs:
deploy:
if: github.event.pull_request.merged == true || github.ref_name == 'master'
runs-on: ubuntu-latest
env:
TARGET: ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }}
Expand All @@ -16,8 +18,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v2
with:
ref: "develop"
- name: Setup ssh
run: |
mkdir -p ~/.ssh/ && touch ~/.ssh/known_hosts
Expand Down

0 comments on commit 643e0ea

Please sign in to comment.