From 648aa7a02ee4e861ae5fee1d1bba44d654c9ec26 Mon Sep 17 00:00:00 2001
From: Pete Cornish <474202+pcornish@users.noreply.github.com>
Date: Thu, 25 Apr 2024 17:36:36 +0100
Subject: [PATCH] fix(ci): use combined schema when publishing Java types.

---
 .github/workflows/build-test.yml | 7 +++++++
 .github/workflows/publish.yml    | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 4cc0a7e..079b978 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -76,6 +76,13 @@ jobs:
           path: v1/json-schemas
           retention-days: 1
 
+      - name: Upload combined schema
+        uses: actions/upload-artifact@v3
+        with:
+          name: combined-schema
+          path: code-generators/java-types/schemas
+          retention-days: 1
+
       - name: Upload TypeScript types
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a58a3d9..54f83a7 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -95,9 +95,11 @@ jobs:
         run: |
           echo "release_version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
-      - name: Generate Java types
-        working-directory: scripts
-        run: ./generate_java_types.sh
+      - name: Download combined schema
+        uses: actions/download-artifact@v3
+        with:
+          name: combined-schema
+          path: code-generators/java-types/schemas
 
       - name: Publish Maven artifact
         working-directory: code-generators/java-types