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:40:35 UTC

[tvm] branch areusch/fix-branch-release-ci updated (561192c4fc -> a866bc30a1)

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


    omit 561192c4fc Try using CHANGE_ID to identify pull requests instead of hardcoding main.
     new a866bc30a1 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   (561192c4fc)
            \
             N -- N -- N   refs/heads/areusch/fix-branch-release-ci (a866bc30a1)

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     | 8 +-------
 ci/jenkins/generated/cortexm_jenkinsfile.groovy | 8 +-------
 ci/jenkins/generated/cpu_jenkinsfile.groovy     | 8 +-------
 ci/jenkins/generated/docker_jenkinsfile.groovy  | 8 +-------
 ci/jenkins/generated/gpu_jenkinsfile.groovy     | 8 +-------
 ci/jenkins/generated/hexagon_jenkinsfile.groovy | 8 +-------
 ci/jenkins/generated/i386_jenkinsfile.groovy    | 8 +-------
 ci/jenkins/generated/lint_jenkinsfile.groovy    | 8 +-------
 ci/jenkins/generated/minimal_jenkinsfile.groovy | 8 +-------
 ci/jenkins/generated/riscv_jenkinsfile.groovy   | 8 +-------
 ci/jenkins/generated/wasm_jenkinsfile.groovy    | 8 +-------
 ci/jenkins/templates/utils/Prepare.groovy.j2    | 6 ------
 12 files changed, 11 insertions(+), 83 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 a866bc30a1ff4e69b1a04063cfbe995049101de4
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     | 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(-)

diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy b/ci/jenkins/generated/arm_jenkinsfile.groovy
index 0fc71b430c..49075e4638 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:40:16.311628
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..891ce1f0d2 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:40:16.195679
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..541e4310da 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:40:16.280856
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..1d51ba4ac1 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:40:16.178640
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..12d84e7e03 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:40:16.212211
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..f8f2f54880 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:40:16.329345
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..c0614231ee 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:40:16.264637
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..442fd0b832 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:40:16.232910
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..a4add851ef 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:40:16.161699
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..352cdd6c4f 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:40:16.248075
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..13b95835e6 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:40:16.297972
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -145,7 +145,7 @@ def init_git() {
   )
 
   // 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..f5b126d039 100644
--- a/ci/jenkins/templates/utils/Prepare.groovy.j2
+++ b/ci/jenkins/templates/utils/Prepare.groovy.j2
@@ -15,7 +15,7 @@ def init_git() {
   )
 
   // 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 {