From 1b83892c9b5b2f564c8c1362230347b5a77fb7cf Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 7 Oct 2024 10:15:26 -0500 Subject: [PATCH] [7.17] Re-enable org wide PR bot (#195131) (#195135) #195131 ~Depends on / needs a commit updating https://github.com/elastic/kibana-buildkite-library/pull/35~ https://github.com/elastic/kibana-buildkite-library/compare/7eff716394a811526d424de0cfe5a02db1e11488...197b21b1fe4181ab5e3f1fce1089f2b13d76480e --- .buildkite/package-lock.json | 14 +++++++------- .buildkite/package.json | 2 +- .buildkite/scripts/lifecycle/post_build.sh | 2 +- .buildkite/scripts/lifecycle/pre_build.sh | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.buildkite/package-lock.json b/.buildkite/package-lock.json index e2caf3bc635e1..14a9a2b436edb 100644 --- a/.buildkite/package-lock.json +++ b/.buildkite/package-lock.json @@ -8,7 +8,7 @@ "name": "kibana-buildkite", "version": "1.0.0", "dependencies": { - "kibana-buildkite-library": "elastic/kibana-buildkite-library#7eff716394a811526d424de0cfe5a02db1e11488" + "kibana-buildkite-library": "elastic/kibana-buildkite-library#197b21b1fe4181ab5e3f1fce1089f2b13d76480e" } }, "node_modules/@nodelib/fs.scandir": { @@ -406,9 +406,9 @@ } }, "node_modules/kibana-buildkite-library": { - "version": "1.1.5", - "resolved": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#7eff716394a811526d424de0cfe5a02db1e11488", - "integrity": "sha512-8tY+gvPlXGujGtQvLiigNnLJzT2Ep+c4j7Hk1UmAv84plrgTlAnpk3V9qjjbcMN34heNRAApvIHUfCGQ2/Y5EQ==", + "version": "1.1.6", + "resolved": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#197b21b1fe4181ab5e3f1fce1089f2b13d76480e", + "integrity": "sha512-vUmtSTLpKJ4OMBMR087fghQfGac7X8ZDvitepuI4llF0wLr46ubLNmFFAXkoGKay5oZvyEtfprUg+GbxiWsz3g==", "dependencies": { "@octokit/rest": "^18.10.0", "axios": "^1.7.4", @@ -931,9 +931,9 @@ } }, "kibana-buildkite-library": { - "version": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#7eff716394a811526d424de0cfe5a02db1e11488", - "integrity": "sha512-8tY+gvPlXGujGtQvLiigNnLJzT2Ep+c4j7Hk1UmAv84plrgTlAnpk3V9qjjbcMN34heNRAApvIHUfCGQ2/Y5EQ==", - "from": "kibana-buildkite-library@elastic/kibana-buildkite-library#7eff716394a811526d424de0cfe5a02db1e11488", + "version": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#197b21b1fe4181ab5e3f1fce1089f2b13d76480e", + "integrity": "sha512-vUmtSTLpKJ4OMBMR087fghQfGac7X8ZDvitepuI4llF0wLr46ubLNmFFAXkoGKay5oZvyEtfprUg+GbxiWsz3g==", + "from": "kibana-buildkite-library@elastic/kibana-buildkite-library#197b21b1fe4181ab5e3f1fce1089f2b13d76480e", "requires": { "@octokit/rest": "^18.10.0", "axios": "^1.7.4", diff --git a/.buildkite/package.json b/.buildkite/package.json index 5762304c94e7a..4bc35784d956b 100644 --- a/.buildkite/package.json +++ b/.buildkite/package.json @@ -3,6 +3,6 @@ "version": "1.0.0", "private": true, "dependencies": { - "kibana-buildkite-library": "elastic/kibana-buildkite-library#7eff716394a811526d424de0cfe5a02db1e11488" + "kibana-buildkite-library": "elastic/kibana-buildkite-library#197b21b1fe4181ab5e3f1fce1089f2b13d76480e" } } \ No newline at end of file diff --git a/.buildkite/scripts/lifecycle/post_build.sh b/.buildkite/scripts/lifecycle/post_build.sh index c18e4c0167f6f..1538daf928db3 100755 --- a/.buildkite/scripts/lifecycle/post_build.sh +++ b/.buildkite/scripts/lifecycle/post_build.sh @@ -5,7 +5,7 @@ set -euo pipefail BUILD_SUCCESSFUL=$(node "$(dirname "${0}")/build_status.js") export BUILD_SUCCESSFUL -if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then +if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]] && [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then "$(dirname "${0}")/commit_status_complete.sh" fi diff --git a/.buildkite/scripts/lifecycle/pre_build.sh b/.buildkite/scripts/lifecycle/pre_build.sh index defea6ba1c4a6..1dc0a712adf93 100755 --- a/.buildkite/scripts/lifecycle/pre_build.sh +++ b/.buildkite/scripts/lifecycle/pre_build.sh @@ -4,7 +4,7 @@ set -euo pipefail source .buildkite/scripts/common/util.sh -if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then +if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]] && [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then "$(dirname "${0}")/commit_status_start.sh" fi