sort zipping by remove -j and working dir. Publish page from html instead of jekyll.

Author: RossBugginsNHS

.github/actions/build-docs/action.yml

@@ -34,6 +34,7 @@ runs:
       #run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
       env:
         JEKYLL_ENV: production
+
     - name: Upload artifact
       # Automatically uploads an artifact from the './_site' directory by default
       uses: actions/upload-pages-artifact@v3

.github/actions/build-sdk/action.yml

@@ -23,6 +23,11 @@ runs:
       shell: bash
       run: mkdir typescript
 
+    - name: make html folder
+      working-directory: ./html
+      shell: bash
+      run: mkdir html
+
     - name: make python folder
       working-directory: ./sdk
       shell: bash
@@ -33,6 +38,12 @@ runs:
       shell: bash
       run: make build
 
+    - name: Upload html artifact
+      uses: actions/upload-artifact@v4
+      with:
+        path: "sdk/html"
+        name: sdk-html-${{ inputs.version }}
+
     - name: Upload ts artifact
       uses: actions/upload-artifact@v4
       with:
@@ -44,3 +55,16 @@ runs:
       with:
         path: "sdk/python"
         name: sdk-python-${{ inputs.version }}
+
+    # - name: Upload artifact
+    #   # Automatically uploads an artifact from the './_site' directory by default
+    #   uses: actions/upload-pages-artifact@v3
+    #   with:
+    #     path: "docs/_site/"
+    #     name: jekyll-docs-${{ inputs.version }}
+
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+        path: "sdk/html/"
+        name: sdk-html-docs-${{ inputs.version }}

.github/workflows/cicd-3-deploy.yaml

@@ -102,15 +102,37 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release download ${{steps.get-asset-version.outputs.release_version}} -p jekyll-docs-*.tar --output artifact.tar
+          gh release download ${{steps.get-asset-version.outputs.release_version}} -p sdk-html-docs-*.tar --output artifact.tar
 
       - uses: actions/upload-artifact@v4
         with:
-          name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
+          name: sdk-html-docs-${{steps.get-asset-version.outputs.release_version}}
           path: artifact.tar
 
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
         with:
-          artifact_name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
+          artifact_name: sdk-html-docs-${{steps.get-asset-version.outputs.release_version}}
+
+
+      ### BELOW WAS THE DEFAULT USING THE JEKYLL BUILD
+
+      # - name: "Get release version"
+      #   id: download-asset
+      #   shell: bash
+      #   env:
+      #     GH_TOKEN: ${{ github.token }}
+      #   run: |
+      #     gh release download ${{steps.get-asset-version.outputs.release_version}} -p jekyll-docs-*.tar --output artifact.tar
+
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
+      #     path: artifact.tar
+
+      # - name: Deploy to GitHub Pages
+      #   id: deployment
+      #   uses: actions/deploy-pages@v4
+      #   with:
+      #     artifact_name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}

.github/workflows/stage-5-publish.yaml

@@ -78,10 +78,26 @@ jobs:
       #  run: zip jekyll-docs-${{ inputs.version }}.zip ./artifact.tar
       #  shell: bash
 
+      - name: "zip html release asset"
+        # Git hub pages needs a single tar called artifact inside the zip.
+        working-directory: ./artifacts/sdk-html-${{ inputs.version }}
+        run: zip -r sdk-html-${{ inputs.version }}.zip .
+        shell: bash
+
+      - name: "Upload sdk html release asset"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: "${{ steps.create_release.outputs.upload_url }}"
+          asset_path: ./artifacts/sdk-html-${{ inputs.version }}.zip
+          asset_name: sdk-html-${{ inputs.version }}.zip
+          asset_content_type: "application/gzip"
+
       - name: "zip sdk ts release asset"
         # Git hub pages needs a single tar called artifact inside the zip.
-        working-directory: ./artifacts
-        run: zip -r -j sdk-ts-${{ inputs.version }}.zip ./sdk-ts-${{ inputs.version }}
+        working-directory: ./artifacts/sdk-ts-${{ inputs.version }}
+        run: zip -r sdk-ts-${{ inputs.version }}.zip .
         shell: bash
 
       - name: "Upload sdk ts release asset"
@@ -96,8 +112,8 @@ jobs:
 
       - name: "zip sdk python release asset"
         # Git hub pages needs a single tar called artifact inside the zip.
-        working-directory: ./artifacts
-        run: zip -r -j sdk-python-${{ inputs.version }}.zip ./sdk-python-${{ inputs.version }}
+        working-directory: ./artifacts/sdk-python-${{ inputs.version }}
+        run: zip -r sdk-python-${{ inputs.version }}.zip .
         shell: bash
 
       - name: "Upload sdk python release asset"

package.json

@@ -43,8 +43,9 @@
   },
   "scripts": {
     "build": "npm run generate",
-    "generate": "npm run generate:ts && npm run generate:python",
+    "generate": "npm run generate:html && npm run generate:ts && npm run generate:python",
     "generate-dependencies": "npm run generate-dependencies --workspaces --if-present",
+    "generate:html": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/specification/api/notify-supplier.yml -g html -o /local/sdk/html --skip-validate-spec",
     "generate:python": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/specification/api/notify-supplier.yml -g python -o /local/sdk/python --skip-validate-spec",
     "generate:ts": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/specification/api/notify-supplier.yml -g typescript -o /local/sdk/typescript --skip-validate-spec",
     "lint": "npm run lint --workspaces",