Merge pull request #123 from maxammann/fix-deployment

Fix deployment of docs, and disable of demo

.github/actions/deploy/action.yml

@@ -20,7 +20,7 @@ runs:
         SSH_KEY: ${{ inputs.key }}
       shell: bash
       run: |
-        echo "$SSH_KEY" > id_rsa
+        echo "$SSH_KEY" > ~/.ssh/id_rsa
-        chmod 600 id_rsa
+        chmod 600 ~/.ssh/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'
+        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 }}/

.github/workflows/build-deploy-docs.yml

@@ -48,19 +48,19 @@ jobs:
     name: Deploy
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v2
+      - name: Download api-docs
+        uses: actions/download-artifact@v2
         with:
           name: api-docs
-      - uses: actions/download-artifact@v2
+          path: artifacts/api
+      - name: Download book
+        uses: actions/download-artifact@v2
         with:
           name: book
-      - uses: ./.github/actions/deploy
+          path: artifacts/book
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@v4.3.3
         with:
-          source: .
+          branch: gh-pages
-          destination: api-docs
+          folder: artifacts
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
-      - uses: ./.github/actions/deploy
-        with:
-          source: .
-          destination: docs
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}

.github/workflows/library-web.yml

@@ -68,17 +68,18 @@ jobs:
       - uses: actions/download-artifact@v2
         with:
           name: webgpu-demo
-      - name: Deploy
+          path: demo
-        if: "!inputs.webgl"
+#      - name: Deploy
-        uses: ./.github/actions/deploy
+#        if: "!inputs.webgl"
-        with:
+#        uses: ./.github/actions/deploy
-          source: .
+#        with:
-          destination: webgl
+#          source: .
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
+#          destination: webgl
-      - name: Deploy
+#          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
-        if: "!inputs.webgl"
+#      - name: Deploy
-        uses: ./.github/actions/deploy
+#        if: "!inputs.webgl"
-        with:
+#        uses: ./.github/actions/deploy
-          source: .
+#        with:
-          destination: webgpu
+#          source: .
-          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
+#          destination: webgpu
+#          key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}