4 files changed, 21 insertions, 13 deletions
diff --git a/.github/workflows/openapi/__generate.yml b/.github/workflows/openapi-generate.yml
index 255cc49e82..255cc49e82 100644
--- a/.github/workflows/openapi/__generate.yml
+++ b/.github/workflows/openapi-generate.yml
diff --git a/.github/workflows/openapi/merge.yml b/.github/workflows/openapi-merge.yml
index a996b2da6b..2421c09ad7 100644
--- a/.github/workflows/openapi/merge.yml
+++ b/.github/workflows/openapi-merge.yml
@@ -6,12 +6,12 @@ on:
     tags:
       - 'v*'
 
-permissions: {}
-
 jobs:
   publish-openapi:
     name: OpenAPI - Publish Artifact
-    uses: ./.github/workflows/openapi/__generate.yml
+    uses: ./.github/workflows/openapi-generate.yml
+    permissions:
+      contents: read
     with:
       ref: ${{ github.sha }}
       repository: ${{ github.repository }}
diff --git a/.github/workflows/openapi/pull-request.yml b/.github/workflows/openapi-pull-request.yml
index 3071027823..563a0a406f 100644
--- a/.github/workflows/openapi/pull-request.yml
+++ b/.github/workflows/openapi-pull-request.yml
@@ -29,7 +29,7 @@ jobs:
 
   head:
     name: Head Artifact
-    uses: ./.github/workflows/openapi/__generate.yml
+    uses: ./.github/workflows/openapi-generate.yml
     with:
       ref: ${{ github.event.pull_request.head.sha }}
       repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -37,7 +37,7 @@ jobs:
 
   base:
     name: Base Artifact
-    uses: ./.github/workflows/openapi/__generate.yml
+    uses: ./.github/workflows/openapi-generate.yml
     needs:
     - ancestor
     with:
@@ -63,10 +63,18 @@ jobs:
         name: openapi-base
         path: openapi-base
     - name: Detect Changes
-      uses: jellyfin/openapi-diff-action@9274f6bda9d01ab091942a4a8334baa53692e8a4 # v1.0.0
       id: openapi-diff
+      run: |
+        sed -i 's:allOf:oneOf:g' openapi-head/openapi.json
+        sed -i 's:allOf:oneOf:g' openapi-base/openapi.json
+
+        mkdir -p /tmp/openapi-report
+        mv openapi-head/openapi.json /tmp/openapi-report/head.json
+        mv openapi-base/openapi.json /tmp/openapi-report/base.json
+
+        docker run -v /tmp/openapi-report:/data openapitools/openapi-diff:2.1.6 /data/base.json /data/head.json --state -l ERROR --markdown /data/openapi-report.md
+    - name: Upload Artifact
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
-        old-spec: openapi-base/openapi.json
-        new-spec: openapi-head/openapi.json
-        markdown: openapi-changelog.md
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        name: openapi-report
+        path: /tmp/openapi-report/openapi-report.md
diff --git a/.github/workflows/openapi/workflow-run.yml b/.github/workflows/openapi-workflow-run.yml
index 9dbd2c40a0..0f9e84e56b 100644
--- a/.github/workflows/openapi/workflow-run.yml
+++ b/.github/workflows/openapi-workflow-run.yml
@@ -46,14 +46,14 @@ jobs:
       id: download_report
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
-        name: openapi-diff-report
-        path: openapi-diff-report
+        name: openapi-report
+        path: openapi-report
         run-id: ${{ github.event.workflow_run.id }}
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Push Comment
       uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
       with:
         github-token: ${{ secrets.JF_BOT_TOKEN }}
-        file-path: ${{ steps.download_report.outputs.download-path }}/openapi-changelog.md
+        file-path: ${{ steps.download_report.outputs.download-path }}/openapi-report.md
         pr-number: ${{ needs.metadata.outputs.pr_number }}
         comment-tag: openapi-report