diff --git a/.github/workflows/auto-merge-upstream.yaml b/.github/workflows/auto-merge-upstream.yaml index 5b3eef48db..1868e85d61 100644 --- a/.github/workflows/auto-merge-upstream.yaml +++ b/.github/workflows/auto-merge-upstream.yaml @@ -23,7 +23,7 @@ jobs: pr_list=$(gh pr list \ --state open \ - --label upstream \ + --search 'label:upstream -label:do-not-merge/hold' \ --json number,title,statusCheckRollup \ --jq ' .[]| select((.statusCheckRollup // [])| all(.conclusion == "SUCCESS" or .conclusion == "SKIPPED"))| "\(.number)"') diff --git a/.github/workflows/update-sources.yaml b/.github/workflows/update-sources.yaml index 26bcba94b4..ac6711e06f 100644 --- a/.github/workflows/update-sources.yaml +++ b/.github/workflows/update-sources.yaml @@ -4,7 +4,6 @@ on: workflow_dispatch: {} jobs: - update-sources: runs-on: ubuntu-latest permissions: diff --git a/.tekton/tektoncd-chains-1-22-controller-pull-request.yaml b/.tekton/tektoncd-chains-1-22-controller-pull-request.yaml index c09554812f..ab91e5a5cc 100644 --- a/.tekton/tektoncd-chains-1-22-controller-pull-request.yaml +++ b/.tekton/tektoncd-chains-1-22-controller-pull-request.yaml @@ -4,7 +4,7 @@ kind: PipelineRun metadata: annotations: pipelinesascode.tekton.dev/cancel-in-progress: "true" # Cancel in-progress pipelines - pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/main/.tekton/docker-build-ta.yaml" + pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/next/.tekton/docker-build-ta.yaml" build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines/tektoncd-chains.git?rev={{revision}} build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' diff --git a/.tekton/tektoncd-chains-1-22-controller-push.yaml b/.tekton/tektoncd-chains-1-22-controller-push.yaml index a37dd54198..921bbb8d17 100644 --- a/.tekton/tektoncd-chains-1-22-controller-push.yaml +++ b/.tekton/tektoncd-chains-1-22-controller-push.yaml @@ -4,7 +4,7 @@ kind: PipelineRun metadata: annotations: pipelinesascode.tekton.dev/cancel-in-progress: "true" # Cancel in-progress pipelines - pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/main/.tekton/docker-build-ta.yaml" + pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/next/.tekton/docker-build-ta.yaml" build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines/tektoncd-chains.git?rev={{revision}} build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}'