Temporary patch broken spec files after download until github/rest-api-description#2609 has been resolved

WyriHaximus · WyriHaximus · commit 1f26fa3af43f · 2023-07-04T09:16:45.000+02:00
diff --git a/.github/workflows/generate-GitHub.yaml b/.github/workflows/generate-GitHub.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHub/previous.spec.yaml || true
           mv etc/specs/GitHub/current.spec.yaml etc/specs/GitHub/previous.spec.yaml
           curl -o etc/specs/GitHub/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/api.github.com/api.github.com.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHub/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubAE.yaml b/.github/workflows/generate-GitHubAE.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubAE/previous.spec.yaml || true
           mv etc/specs/GitHubAE/current.spec.yaml etc/specs/GitHubAE/previous.spec.yaml
           curl -o etc/specs/GitHubAE/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/github.ae/github.ae.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubAE/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.0.yaml b/.github/workflows/generate-GitHubEnterprise-3.0.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.0/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.0/current.spec.yaml etc/specs/GitHubEnterprise-3.0/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.0/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.0/ghes-3.0.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.0/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.1.yaml b/.github/workflows/generate-GitHubEnterprise-3.1.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.1/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.1/current.spec.yaml etc/specs/GitHubEnterprise-3.1/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.1/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.1/ghes-3.1.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.1/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.2.yaml b/.github/workflows/generate-GitHubEnterprise-3.2.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.2/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.2/current.spec.yaml etc/specs/GitHubEnterprise-3.2/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.2/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.2/ghes-3.2.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.2/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.3.yaml b/.github/workflows/generate-GitHubEnterprise-3.3.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.3/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.3/current.spec.yaml etc/specs/GitHubEnterprise-3.3/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.3/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.3/ghes-3.3.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.3/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.4.yaml b/.github/workflows/generate-GitHubEnterprise-3.4.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.4/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.4/current.spec.yaml etc/specs/GitHubEnterprise-3.4/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.4/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.4/ghes-3.4.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.4/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.5.yaml b/.github/workflows/generate-GitHubEnterprise-3.5.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.5/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.5/current.spec.yaml etc/specs/GitHubEnterprise-3.5/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.5/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.5/ghes-3.5.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.5/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.6.yaml b/.github/workflows/generate-GitHubEnterprise-3.6.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.6/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.6/current.spec.yaml etc/specs/GitHubEnterprise-3.6/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.6/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.6/ghes-3.6.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.6/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.7.yaml b/.github/workflows/generate-GitHubEnterprise-3.7.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.7/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.7/current.spec.yaml etc/specs/GitHubEnterprise-3.7/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.7/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.7/ghes-3.7.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.7/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.8.yaml b/.github/workflows/generate-GitHubEnterprise-3.8.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.8/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.8/current.spec.yaml etc/specs/GitHubEnterprise-3.8/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.8/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.8/ghes-3.8.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.8/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterprise-3.9.yaml b/.github/workflows/generate-GitHubEnterprise-3.9.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterprise-3.9/previous.spec.yaml || true
           mv etc/specs/GitHubEnterprise-3.9/current.spec.yaml etc/specs/GitHubEnterprise-3.9/previous.spec.yaml
           curl -o etc/specs/GitHubEnterprise-3.9/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghes-3.9/ghes-3.9.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterprise-3.9/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/.github/workflows/generate-GitHubEnterpriseCloud.yaml b/.github/workflows/generate-GitHubEnterpriseCloud.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/GitHubEnterpriseCloud/previous.spec.yaml || true
           mv etc/specs/GitHubEnterpriseCloud/current.spec.yaml etc/specs/GitHubEnterpriseCloud/previous.spec.yaml
           curl -o etc/specs/GitHubEnterpriseCloud/current.spec.yaml https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/ghec/ghec.yaml
+          php utils/patch-broken-spec-files.php etc/specs/GitHubEnterpriseCloud/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/etc/workflow-skeleton/generate-{{ path }}.yaml b/etc/workflow-skeleton/generate-{{ path }}.yaml
@@ -18,6 +18,7 @@ jobs:
           rm etc/specs/{{ path }}/previous.spec.yaml || true
           mv etc/specs/{{ path }}/current.spec.yaml etc/specs/{{ path }}/previous.spec.yaml
           curl -o etc/specs/{{ path }}/current.spec.yaml {{ specUrl }}
+          php utils/patch-broken-spec-files.php etc/specs/{{ path }}/current.spec.yaml
       - name: Hash specs
         id: spec-hash
         run: |
diff --git a/utils/patch-broken-spec-files.php b/utils/patch-broken-spec-files.php
@@ -0,0 +1,19 @@
+<?php
+
+file_put_contents(
+    $argv[1],
+    str_replace(
+        [
+            "      description: 'A group of pull requests that the merge queue has grouped together
+        to be merged.
+
+'"
+        ],
+        [
+            "      description: 'A group of pull requests that the merge queue has grouped together to be merged.'"
+        ],
+        file_get_contents(
+            $argv[1],
+        ),
+    ),
+);
