You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by ar...@apache.org on 2023/02/24 18:32:29 UTC
[tvm] branch areusch/fix-branch-release-ci updated (0ed6135ef5 -> 561192c4fc)
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a change to branch areusch/fix-branch-release-ci
in repository https://gitbox.apache.org/repos/asf/tvm.git
discard 0ed6135ef5 Try using CHANGE_ID to identify pull requests instead of hardcoding main.
new 561192c4fc Try using CHANGE_ID to identify pull requests instead of hardcoding main.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0ed6135ef5)
\
N -- N -- N refs/heads/areusch/fix-branch-release-ci (561192c4fc)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/jenkins/generated/arm_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/cortexm_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/cpu_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/docker_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/gpu_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/hexagon_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/i386_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/lint_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/minimal_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/riscv_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/wasm_jenkinsfile.groovy | 4 ++--
ci/jenkins/templates/utils/Prepare.groovy.j2 | 2 +-
12 files changed, 23 insertions(+), 23 deletions(-)
[tvm] 01/01: Try using CHANGE_ID to identify pull requests instead of hardcoding main.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a commit to branch areusch/fix-branch-release-ci
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 561192c4fc0df7deb8c71b3ce02de08ea0a81310
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Fri Feb 24 10:27:37 2023 -0800
Try using CHANGE_ID to identify pull requests instead of hardcoding main.
---
ci/jenkins/generated/arm_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/cortexm_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/cpu_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/docker_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/gpu_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/hexagon_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/i386_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/lint_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/minimal_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/riscv_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/wasm_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/templates/utils/Prepare.groovy.j2 | 8 +++++++-
12 files changed, 95 insertions(+), 23 deletions(-)
diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy b/ci/jenkins/generated/arm_jenkinsfile.groovy
index 0fc71b430c..a8baaf1782 100644
--- a/ci/jenkins/generated/arm_jenkinsfile.groovy
+++ b/ci/jenkins/generated/arm_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.387114
+// Generated at 2023-02-24T10:32:14.052659
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/cortexm_jenkinsfile.groovy b/ci/jenkins/generated/cortexm_jenkinsfile.groovy
index 25846f5b4b..544707dc45 100644
--- a/ci/jenkins/generated/cortexm_jenkinsfile.groovy
+++ b/ci/jenkins/generated/cortexm_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.437899
+// Generated at 2023-02-24T10:32:13.934892
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/cpu_jenkinsfile.groovy b/ci/jenkins/generated/cpu_jenkinsfile.groovy
index f9ede00399..dfa809c1d0 100644
--- a/ci/jenkins/generated/cpu_jenkinsfile.groovy
+++ b/ci/jenkins/generated/cpu_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.540570
+// Generated at 2023-02-24T10:32:14.021011
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/docker_jenkinsfile.groovy b/ci/jenkins/generated/docker_jenkinsfile.groovy
index 9e1946c194..672e506ab9 100644
--- a/ci/jenkins/generated/docker_jenkinsfile.groovy
+++ b/ci/jenkins/generated/docker_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.508775
+// Generated at 2023-02-24T10:32:13.917542
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/gpu_jenkinsfile.groovy b/ci/jenkins/generated/gpu_jenkinsfile.groovy
index a5609697af..479bdfa83b 100644
--- a/ci/jenkins/generated/gpu_jenkinsfile.groovy
+++ b/ci/jenkins/generated/gpu_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.455336
+// Generated at 2023-02-24T10:32:13.951806
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/hexagon_jenkinsfile.groovy b/ci/jenkins/generated/hexagon_jenkinsfile.groovy
index c2f39a0d08..2683c15ac9 100644
--- a/ci/jenkins/generated/hexagon_jenkinsfile.groovy
+++ b/ci/jenkins/generated/hexagon_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.369191
+// Generated at 2023-02-24T10:32:14.070736
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/i386_jenkinsfile.groovy b/ci/jenkins/generated/i386_jenkinsfile.groovy
index ae66fbe3e4..45aeae8a2b 100644
--- a/ci/jenkins/generated/i386_jenkinsfile.groovy
+++ b/ci/jenkins/generated/i386_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.421467
+// Generated at 2023-02-24T10:32:14.004483
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/lint_jenkinsfile.groovy b/ci/jenkins/generated/lint_jenkinsfile.groovy
index f8dccc8635..3690dfad29 100644
--- a/ci/jenkins/generated/lint_jenkinsfile.groovy
+++ b/ci/jenkins/generated/lint_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.476946
+// Generated at 2023-02-24T10:32:13.972907
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/minimal_jenkinsfile.groovy b/ci/jenkins/generated/minimal_jenkinsfile.groovy
index 6c4abb0bd5..4369f10e90 100644
--- a/ci/jenkins/generated/minimal_jenkinsfile.groovy
+++ b/ci/jenkins/generated/minimal_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.492813
+// Generated at 2023-02-24T10:32:13.900366
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/riscv_jenkinsfile.groovy b/ci/jenkins/generated/riscv_jenkinsfile.groovy
index 7b9bbe7ad3..9a77010f9f 100644
--- a/ci/jenkins/generated/riscv_jenkinsfile.groovy
+++ b/ci/jenkins/generated/riscv_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.405262
+// Generated at 2023-02-24T10:32:13.988421
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/wasm_jenkinsfile.groovy b/ci/jenkins/generated/wasm_jenkinsfile.groovy
index 8c8ee03886..f3aea08116 100644
--- a/ci/jenkins/generated/wasm_jenkinsfile.groovy
+++ b/ci/jenkins/generated/wasm_jenkinsfile.groovy
@@ -60,7 +60,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-12-09T15:39:24.526394
+// Generated at 2023-02-24T10:32:14.038668
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/templates/utils/Prepare.groovy.j2 b/ci/jenkins/templates/utils/Prepare.groovy.j2
index d5aebdc070..f2dc11e6ff 100644
--- a/ci/jenkins/templates/utils/Prepare.groovy.j2
+++ b/ci/jenkins/templates/utils/Prepare.groovy.j2
@@ -14,8 +14,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (!env.CHANGE_ID) {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {