From 1ba6079ba2b83090d0377ffad845556d7b08455c Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Fri, 3 Jun 2022 11:10:15 +0200
Subject: [PATCH] Fix deployment of docs, and disable of demo

---
 .github/actions/deploy/action.yml       |  6 ++---
 .github/workflows/build-deploy-docs.yml | 21 +++++++++---------
 .github/workflows/library-web.yml       | 29 +++++++++++++------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
index b3ebf2672..cff90ffb2 100644
--- a/.github/actions/deploy/action.yml
+++ b/.github/actions/deploy/action.yml
@@ -20,7 +20,7 @@ runs:
         SSH_KEY: ${{ inputs.key }}
       shell: bash
       run: |
-        echo "$SSH_KEY" > id_rsa
-        chmod 600 id_rsa
-        ssh -o StrictHostKeyChecking=no -i id_rsa max@maxammann.org 'mkdir -p ~/public_html/maplibre-rs/${{ inputs.destination }} && find ~/public_html/maplibre-rs/${{ inputs.destination }} -type f -not -name ".htaccess" -delete'
+        echo "$SSH_KEY" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa max@maxammann.org 'mkdir -p ~/public_html/maplibre-rs/${{ inputs.destination }} && find ~/public_html/maplibre-rs/${{ inputs.destination }} -type f -not -name ".htaccess" -delete'
         rsync -e "ssh -o StrictHostKeyChecking=no -i id_rsa" -r "${{ inputs.source }}" max@maxammann.org:~/public_html/maplibre-rs/${{ inputs.destination }}/
diff --git a/.github/workflows/build-deploy-docs.yml b/.github/workflows/build-deploy-docs.yml
index 461d27ceb..35d34f457 100644
--- a/.github/workflows/build-deploy-docs.yml
+++ b/.github/workflows/build-deploy-docs.yml
@@ -48,19 +48,18 @@ jobs:
     name: Deploy
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/download-artifact@v2
+      - name: Download api-docs
+        uses: actions/download-artifact@v2
         with:
           name: api-docs
-      - uses: actions/download-artifact@v2
+          path: docs/api
+      - name: Download book
+        uses: actions/download-artifact@v2
         with:
           name: book
-      - uses: ./.github/actions/deploy
+          path: docs/book
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@4.3.3
         with:
-          source: .
-          destination: api-docs
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
-      - uses: ./.github/actions/deploy
-        with:
-          source: .
-          destination: docs
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
\ No newline at end of file
+          branch: gh-pages
+          folder: docs
diff --git a/.github/workflows/library-web.yml b/.github/workflows/library-web.yml
index 35c6d9ea9..afc2ac590 100644
--- a/.github/workflows/library-web.yml
+++ b/.github/workflows/library-web.yml
@@ -68,17 +68,18 @@ jobs:
       - uses: actions/download-artifact@v2
         with:
           name: webgpu-demo
-      - name: Deploy
-        if: "!inputs.webgl"
-        uses: ./.github/actions/deploy
-        with:
-          source: .
-          destination: webgl
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
-      - name: Deploy
-        if: "!inputs.webgl"
-        uses: ./.github/actions/deploy
-        with:
-          source: .
-          destination: webgpu
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
+          path: demo
+#      - name: Deploy
+#        if: "!inputs.webgl"
+#        uses: ./.github/actions/deploy
+#        with:
+#          source: .
+#          destination: webgl
+#          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
+#      - name: Deploy
+#        if: "!inputs.webgl"
+#        uses: ./.github/actions/deploy
+#        with:
+#          source: .
+#          destination: webgpu
+#          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}