Merge branch 'main' into dependabot/npm_and_yarn/interop/authzen-inte…

…rop-website/webpack-5.94.0
openid · Sep 15, 2024 · c784dc0 · c784dc0
2 parents a12e9c8 + fc61c50
commit c784dc0
Show file tree

Hide file tree

Showing 4 changed files with 1,549 additions and 31 deletions.
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -25,47 +25,65 @@ jobs:
       - name: Install xml2rfc
         run: pip install xml2rfc
 
-      - name: Convert Authz API 1.0 to rfc xml
-        run: kramdown-rfc2629 api/authorization-api-1_0.md > api/authorization-api-1_0.xml
-      - name: Render Authz API HTML
-        run: xml2rfc api/authorization-api-1_0.xml --html -o index.html
-      - name: Render Authz API Text
-        run: xml2rfc api/authorization-api-1_0.xml --text
-      - name: Upload Authz API artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: output
-          path: |
-            index.html
-            api/authorization-api-1_0.xml
+      # Now that revision 00 is superseded, don't build it anymore
+      # - name: Convert Authz API 1.0 revision 00 to rfc xml
+      #   run: kramdown-rfc2629 api/authorization-api-1_0_00.md > api/authorization-api-1_0_00.xml
+      # - name: Render Authz API 1.0 revision 00 HTML
+      #   run: xml2rfc api/authorization-api-1_0_00.xml --html -o authorization-api-1_0_00.html
+      # - name: Render Authz API 1.0 revision 00 Text
+      #   run: xml2rfc api/authorization-api-1_0_00.xml --text
+      # - name: Upload Authz API 1.0 revision 00 artifact
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: output
+      #     path: |
+      #       authorization-api-1_0_00.html
+      #       api/authorization-api-1_0.xml
 
-      - name: Convert Authz API 1.1 to rfc xml
-        run: kramdown-rfc2629 api/authorization-api-1_1.md > api/authorization-api-1_1.xml
-      - name: Render Authz API 1.1 HTML
-        run: xml2rfc api/authorization-api-1_1.xml --html -o authorization-api-1_1.html
-      - name: Render Authz API 1.1 Text
-        run: xml2rfc api/authorization-api-1_1.xml --text
-      - name: Upload Authz API 1.1 artifact
+      - name: Convert Authz API 1.0 revision 01 to rfc xml
+        run: kramdown-rfc2629 api/authorization-api-1_0_01.md > api/authorization-api-1_0_01.xml
+      - name: Render Authz API 1.0 revision 01 HTML
+        run: xml2rfc api/authorization-api-1_0_01.xml --html -o authorization-api-1_0_01.html
+      - name: Render Index HTML (this is the current stable version of the spec)
+        run: xml2rfc api/authorization-api-1_0_01.xml --html -o index.html
+      - name: Render Authz API 1.0 revision 01 Text
+        run: xml2rfc api/authorization-api-1_0_01.xml --text
+      - name: Upload Authz API 1.0 revision 01 artifact
         uses: actions/upload-artifact@v2
         with:
           name: output
           path: |
-            authorization-api-1_1.html
-            api/authorization-api-1_1.xml      
+            index.html
+            authorization-api-1_0_01.html
+            api/authorization-api-1_0_01.xml      
       
-      - name: Convert Authz API Original to rfc xml
-        run: kramdown-rfc2629 api/authorization-api-1_0-original.md > api/authorization-api-1_0-original.xml
-      - name: Render Authz API Original HTML
-        run: xml2rfc api/authorization-api-1_0-original.xml --html -o authorization-api-1_0-original.html
-      - name: Render Authz API Original Text
-        run: xml2rfc api/authorization-api-1_0-original.xml --text
-      - name: Upload Authz API Original artifact
+      - name: Convert Authz API 1.1 revision 01 to rfc xml
+        run: kramdown-rfc2629 api/authorization-api-1_1_01.md > api/authorization-api-1_1_01.xml
+      - name: Render Authz API 1.1 revision 01 HTML
+        run: xml2rfc api/authorization-api-1_1_01.xml --html -o authorization-api-1_1_01.html
+      - name: Render Authz API 1.1 revision 01 Text
+        run: xml2rfc api/authorization-api-1_1_01.xml --text
+      - name: Upload Authz API 1.1 revision 01 artifact
         uses: actions/upload-artifact@v2
         with:
           name: output
           path: |
-            authorization-api-1_0-original.html
-            api/authorization-api-1_0-original.xml
+            authorization-api-1_1_01.html
+            api/authorization-api-1_1_01.xml      
+      
+      # - name: Convert Authz API Original to rfc xml
+      #   run: kramdown-rfc2629 api/authorization-api-1_0-original.md > api/authorization-api-1_0-original.xml
+      # - name: Render Authz API Original HTML
+      #   run: xml2rfc api/authorization-api-1_0-original.xml --html -o authorization-api-1_0-original.html
+      # - name: Render Authz API Original Text
+      #   run: xml2rfc api/authorization-api-1_0-original.xml --text
+      # - name: Upload Authz API Original artifact
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: output
+      #     path: |
+      #       authorization-api-1_0-original.html
+      #       api/authorization-api-1_0-original.xml
 
       - name: Convert Authz Design Patterns to rfc xml
         run: kramdown-rfc2629 patterns/AuthorizationDesignPatterns.md > patterns/AuthorizationDesignPatterns.xml

diff --git a/api/authorization-api-1_0.md → api/authorization-api-1_0_00.md b/api/authorization-api-1_0.md → api/authorization-api-1_0_00.md