1.2.1.0: Archive changes

queenkjuul · Nov 12, 2024 · 68c7e42 · 68c7e42
1 parent ebc26df
commit 68c7e42
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -61,4 +61,4 @@ jobs:
           key: ${{ secrets.KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
           source: "spotify97-server-macos-x64-${{env.PACKAGE_VERSION}}-${{ env.SHA }}.tar.gz"
-          target: /srv/www/public/spotifyclient97/server/${{ env.PACKAGE_VERSION }}/${{ env.SHA }}/
+          target: /srv/www/public/spotifyclient97/downloads/server/${{ env.PACKAGE_VERSION }}/${{ env.SHA }}/
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -61,4 +61,4 @@ jobs:
           key: ${{ secrets.KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
           source: "spotify97-server-win64-${{env.PACKAGE_VERSION}}-${{ env.SHA }}.zip"
-          target: /srv/www/public/spotifyclient97/server/${{ env.PACKAGE_VERSION }}/${{ env.SHA }}/
+          target: /srv/www/public/spotifyclient97/downloads/server/${{ env.PACKAGE_VERSION }}/${{ env.SHA }}/
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -35,6 +35,7 @@ jobs:
         with:
           source: ./
           destination: ./_site
+      - run: ls -la _site
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
       - name: Upload to retro.queenkjuul.xyz
@@ -45,7 +46,7 @@ jobs:
           port: ${{ secrets.PORT }}
           key: ${{ secrets.KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
-          source: ./_site/
+          source: ./_site/*
           target: /srv/www/public/spotifyclient97/docs/
 
   # Deployment job

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -110,7 +110,7 @@ jobs:
           key: ${{ secrets.KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
           source: "server/dist/spotify97-server-linux-arm64-${{env.PACKAGE_VERSION}}-release.tar.gz,server/dist/spotify97-server-linux-x64-${{env.PACKAGE_VERSION}}-release.tar.gz"
-          target: /srv/www/public/spotifyclient97/server/${{ env.PACKAGE_VERSION }}/release/
+          target: /srv/www/public/spotifyclient97/downloads/server/${{ env.PACKAGE_VERSION }}/release/
           strip_components: 2
   publish:
     runs-on: ubuntu-latest
@@ -143,7 +143,17 @@ jobs:
           name: spotify97-server-win64-${{ env.PACKAGE_VERSION }}-release
           path: .
       - run: ls -la
-      - name: upload
+      - name: upload server
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          port: ${{ secrets.PORT }}
+          key: ${{ secrets.KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          source: "./client/Spotify97MacEdition/dist/*,./client/SpotifyClient97/dist/*"
+          target: /srv/www/public/spotifyclient97/downloads/client/
+      - name: upload client
         uses: appleboy/[email protected]
         with:
           host: ${{ secrets.HOST }}
@@ -152,7 +162,7 @@ jobs:
           key: ${{ secrets.KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
           source: "spotify97-server-win64-${{env.PACKAGE_VERSION}}-release.zip,spotify97-server-macos-x64-${{env.PACKAGE_VERSION}}.tar.gz"
-          target: /srv/www/public/spotifyclient97/server/${{ env.PACKAGE_VERSION }}/release
+          target: /srv/www/public/spotifyclient97/downloads/server/${{ env.PACKAGE_VERSION }}/release
       - uses: ncipollo/release-action@v1
         with:
           artifacts: "spotify97-server-*.tar.gz,spotify97-server-*.zip,client/Spotify97MacEdition/dist/*,client/SpotifyClient97/dist/*"