Merge pull request #1094 from OpenLiberty/staging

Merge staging to prod - enable the jakarta-websocket guide to run java17 daily build (#1093)
OpenLiberty · Oct 29, 2024 · aeaeebd · aeaeebd
2 parents f94e258 + 7510de2
commit aeaeebd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/daily-build-java17.yml b/.github/workflows/daily-build-java17.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Get default repos
         if: ${{ github.event_name == 'repository_dispatch' || github.event_name == 'workflow_dispatch' && github.event.inputs.guide == 'all' }}
         id: create-list
-        run: echo "repos=[ 'guide-spring-boot', 'guide-liberty-deep-dive', 'guide-liberty-deep-dive-gradle', 'guide-contract-testing', 'guide-jms-intro' ]" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=repos::$(python3 .github/workflows/get-guides-java17.py)"
       - name: Set input repo
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.guide != 'all' }}
         id: input-guide

diff --git a/.github/workflows/get-guides-java17.py b/.github/workflows/get-guides-java17.py
@@ -0,0 +1,6 @@
+import json
+
+JSON_PATH = ".github/workflows/guides-java17.json"
+
+if __name__ == "__main__":
+    print(json.load(open(JSON_PATH)))
diff --git a/.github/workflows/guides-java17.json b/.github/workflows/guides-java17.json
@@ -0,0 +1,9 @@
+[
+  "guide-contract-testing",
+  "guide-jakarta-websocket",
+  "guide-jms-intro",
+  "guide-liberty-deep-dive",
+  "guide-liberty-deep-dive-gradle",
+  "guide-spring-boot"
+]
+
diff --git a/cloud-hosted-guides.json b/cloud-hosted-guides.json
@@ -63,6 +63,7 @@
      "grpc-intro"                      : "/courses/course-v1:IBM+GPXX0BCEN+v1/auto_enroll?next=/courses/course-v1:IBM+GPXX0BCEN+v1/courseware/guided_project/guided_project",
      "microprofile-telemetry-jaeger"   : "/courses/course-v1:IBM+GPXX0SXIEN+v1/auto_enroll?next=/courses/course-v1:IBM+GPXX0SXIEN+v1/courseware/guided_project/guided_project",
      "testcontainers"                  : "/courses/course-v1:OpenLiberty+GPXX0LEREN+v1/auto_enroll?next=/courses/course-v1:OpenLiberty+GPXX0LEREN+v1/courseware",
-     "microprofile-config-profile"     : "/courses/course-v1:OpenLiberty+GPXX0EZCEN+v1/auto_enroll?next=/courses/course-v1:OpenLiberty+GPXX0EZCEN+v1/courseware" 
+     "microprofile-config-profile"     : "/courses/course-v1:OpenLiberty+GPXX0EZCEN+v1/auto_enroll?next=/courses/course-v1:OpenLiberty+GPXX0EZCEN+v1/courseware",
+     "jms-intro"                       : "/courses/course-v1:OpenLiberty+GPXX0XDOEN+v1/auto_enroll?next=/courses/course-v1:OpenLiberty+GPXX0XDOEN+v1/courseware" 
    }
 }
diff --git a/guide_prereqs.json b/guide_prereqs.json
@@ -4,15 +4,15 @@
             "name": "Java SDK",
             "link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
             "guides": ["*"], 
-            "exclude": ["jpa-intro", "contract-testing", "jms-intro"]
+            "exclude": ["jpa-intro", "contract-testing", "jakarta-websocket", "jms-intro", "spring-boot"]
         },
         {
             "name": "Java SDK 17+",
             "link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
-            "guides": ["contract-testing", "jms-intro", "spring-boot"]
+            "guides": ["contract-testing", "jakarta-websocket", "jms-intro", "spring-boot"]
         },
         {
-            "name": "Java SDK 21",
+            "name": "Java SDK 21+",
             "link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
             "guides": ["jpa-intro"]
         },