diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e855a01e..27d70e0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,11 @@ name: Tipi CI on: - push: pull_request: types: [opened, synchronize, reopened, ready_for_review, labeled] jobs: ci: - if: github.event_name == 'push' && !contains(github.ref_name, 'renovate') || contains(github.event.pull_request.labels.*.name, 'ready') || (github.event_name == 'pull_request' && !contains(github.event.pull_request.head.ref, 'renovate')) + if: contains(github.event.pull_request.head.commit.message, '[ready]') || !contains(github.head_ref, 'renovate') runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/renovate-app-version.yml b/.github/workflows/renovate-app-version.yml index 40c68dd7..5f3dcb7a 100644 --- a/.github/workflows/renovate-app-version.yml +++ b/.github/workflows/renovate-app-version.yml @@ -1,20 +1,11 @@ name: Update app version in Renovate Branches on: - pull_request: - types: - - labeled - - opened - - edited - - assigned - - synchronize - - reopened - - unlocked - - ready_for_review + push: + branches: ["renovate/*"] jobs: update-app-version: - if: github.event_name == 'pull_request' && contains(github.event.pull_request.head.ref, 'renovate') runs-on: ubuntu-latest steps: - name: Checkout @@ -45,17 +36,4 @@ jobs: - name: Commit & Push Changes run: | - git add "apps/*/config.json" && git commit -m "chore: update config.json version" --no-edit --no-verify && git push || true - - - name: Label this PR as "ready" - if: github.event_name == 'pull_request' - uses: actions/github-script@v4 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - github.issues.addLabels({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - labels: ["ready"] - }) + git add "apps/*/config.json" && git commit -m "chore: update config.json version [ready]" --no-edit --no-verify && git push || true