diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index b3ebf267..cff90ffb 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 461d27ce..dfb87925 100644 --- a/.github/workflows/build-deploy-docs.yml +++ b/.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: . - 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: artifacts diff --git a/.github/workflows/library-web.yml b/.github/workflows/library-web.yml index 35c6d9ea..afc2ac59 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 }}