[DEV] Add Ability to Skip Builds

2025-02-01 18:28:52 +02:00
parent a4aa7108e5
commit c328a07345
19 changed files with 76 additions and 23 deletions
--- a/1.18.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.18.2/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.19.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.19.2/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.19.3/.jenkins/Jenkinsfile.snapshot
+++ b/1.19.3/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.20.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.20.2/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.20.4/.jenkins/Jenkinsfile.snapshot
+++ b/1.20.4/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -32,10 +32,6 @@ public class ForgeCompatHelper implements CompatUtils {

    @Override
    public boolean playerRevived(BridgedPlayer player) {
-        if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
-            return false;
-
-        IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
-        return bleeding != null && bleeding.revived();
+        return false;
    }
 }
--- a/1.20/.jenkins/Jenkinsfile.snapshot
+++ b/1.20/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.21.2/.jenkins/Jenkinsfile.snapshot
+++ b/1.21.2/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/1.21/.jenkins/Jenkinsfile.snapshot
+++ b/1.21/.jenkins/Jenkinsfile.snapshot
@@ -20,6 +20,12 @@ pipeline {
    }

    stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
        stage("Notify Discord") {
            steps {
                discordSend webhookURL: env.SSS_WEBHOOK,
--- a/commit.sha
+++ b/commit.sha
@@ -1 +1 @@
-7f9ff38768686f25acef284357ebeee1f011e156
+3986f085401b233e650720350a165b476d839041
--- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -16,7 +16,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -40,7 +40,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -16,7 +16,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -40,7 +40,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
@@ -16,7 +16,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -40,7 +40,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -16,7 +16,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -40,7 +40,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
@@ -16,7 +16,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -40,7 +40,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -22,7 +22,7 @@
     }
 
     @Override
-@@ -19,19 +22,12 @@
+@@ -19,27 +22,16 @@
 
     @Override
     public boolean isPlayerBleeding(BridgedPlayer player) {
@@ -44,3 +44,12 @@
     }
 
     @Override
+     public boolean playerRevived(BridgedPlayer player) {
+-        if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
+-            return false;
+-
+-        IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
+-        return bleeding != null && bleeding.revived();
+        return false;
+     }
+ }
--- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
@@ -16,7 +16,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -40,7 +40,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -9,7 +9,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -33,7 +33,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {
--- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
@@ -14,7 +14,7 @@
 
 pipeline {
     agent {
-@@ -32,15 +32,19 @@
+@@ -38,15 +38,19 @@
 
         stage("Prepare") {
             steps {
@@ -38,7 +38,7 @@
                 }
             }
         }
-@@ -48,21 +52,23 @@
+@@ -54,21 +58,23 @@
 
     post {
         always {