Add extra ci step except the revert check, and use our new custom build

niloc132 · Nov 27, 2024 · b33cbc6 · b33cbc6
1 parent c79128f
commit b33cbc6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
@@ -43,7 +43,19 @@ jobs:
         run: |
           .github/scripts/gradle-properties.sh >> gradle.properties
           cat gradle.properties
+      - name: Check out Jetty
+        uses: actions/checkout@v4
+        with:
+          repository: 'eclipse/jetty.project'
+          path: 'jetty.project'
+          ref: 'jetty-11.0.24'
 
+      - name: Revert vers bump, and build only what we need for our test
+        run: |
+          cd jetty.project
+          git revert HEAD
+#          git revert --no-edit 8259eab
+          mvn clean install -DskipTests -am -pl org.eclipse.jetty:jetty-alpn-java-server,org.eclipse.jetty:jetty-alpn-server,org.eclipse.jetty:jetty-bom,org.eclipse.jetty.http2:http2-server,org.eclipse.jetty:jetty-servlet,org.eclipse.jetty:jetty-servlets,org.eclipse.jetty:jetty-webapp,org.eclipse.jetty.websocket:websocket-jakarta-server
       - name: Check
         run: ./gradlew --scan --continue check
 

diff --git a/buildSrc/src/main/groovy/io.deephaven.repository-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.repository-conventions.gradle
@@ -13,4 +13,5 @@ repositories {
             includeGroup 'org.apache.kafka'
         }
     }
+    mavenLocal()
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ javax-inject = "1"
 javax-validation = "2.0.1.Final"
 jdom2 = "2.0.6.1"
 jetbrains = "26.0.1"
-jetty = "11.0.20"
+jetty = "11.0.24-SNAPSHOT"
 jpy = "0.19.0"
 jsinterop = "2.0.2"
 # google is annoying, and have different versions released for the same groupId
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,5 @@ repositories { @@
                 includeGroup 'org.apache.kafka'
             }
         }
+        mavenLocal()
     }