diff --git a/.gitea/workflows/release/tag-when-pr-merged-from-branch-release.yaml b/.gitea/workflows/release/tag-when-pr-merged-from-branch-release.yaml index 947606d..5d65fc5 100644 --- a/.gitea/workflows/release/tag-when-pr-merged-from-branch-release.yaml +++ b/.gitea/workflows/release/tag-when-pr-merged-from-branch-release.yaml @@ -10,7 +10,7 @@ on: jobs: tag_if_merged: - if: github.event.pull_request.merged == true and startsWith(github.head_ref, 'release/') + if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') runs-on: ubuntu-latest steps: - name: changie latest diff --git a/.gitea/workflows/release/update-composer-lock.yaml b/.gitea/workflows/release/update-composer-lock.yaml index 804883f..4753a44 100644 --- a/.gitea/workflows/release/update-composer-lock.yaml +++ b/.gitea/workflows/release/update-composer-lock.yaml @@ -39,16 +39,19 @@ jobs: version: latest args: 'new --body "Update dependencies. Chill-bundles upgraded from ${{ steps.chill-before.outputs.value }} to ${{ steps.chill-after.outputs.value }}" --kind Release --custom "Issue=0"' - name: changie batch + if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} uses: https://github.com/miniscruff/changie-action@v2 with: version: latest args: 'batch auto' - name: changie merge + if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} uses: https://github.com/miniscruff/changie-action@v2 with: version: latest args: 'merge' - name: commit changed files + if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 with: commit_message: "update composer.lock and file (automatic update)"