diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index f290851..efd4e85 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -30,12 +30,13 @@ jobs: docker-opts: if: | github.event_name == 'workflow_dispatch' || - (github.event_name == 'push' && github.event.pull_request.merged == true) + github.event_name == 'push' || + (github.event_name == 'pull_request' && github.event.pull_request.merged == true) runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - with - ref: ${{ github.event.pull_request.base.ref }} + with: + ref: ${{ github.event.pull_request.base.ref || github.ref }} - name: Get tag shell: bash