Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.2.1.0: Server QoL improvements, deployment updates #4

Merged
merged 7 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ jobs:
key: ${{ secrets.KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
source: "server/dist/spotify97-server-linux-arm64-${{env.PACKAGE_VERSION}}-${{ env.SHA }}.tar.gz,server/dist/spotify97-server-linux-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 }}/
strip_components: 2
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}/
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}/
16 changes: 13 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -143,7 +143,17 @@ jobs:
name: spotify97-server-win64-${{ env.PACKAGE_VERSION }}-release
path: .
- run: ls -la
- name: upload
- name: upload client
uses: appleboy/scp-action@v0.1.7
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/
- name: upload server
uses: appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.HOST }}
Expand All @@ -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/*"
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

A client-server system to control Spotify Connect devices from retro machines (Windows 95 and up or Mac OS 8.6-10.5) Requires Spotify Premium. Does not stream audio, only remote-controls other Spotify devices.

[*retro-accessible docs and downloads here*](http://retro.queenkjuul.xyz/spotify97)

[*server dev builds hosted here*](http://retro.queenkjuul.xyz/spotify97/server)

![windows-server](https://github.com/queenkjuul/spotify97/actions/workflows/build-windows.yml/badge.svg)
Expand All @@ -14,7 +16,7 @@ A client-server system to control Spotify Connect devices from retro machines (W

![Screenshot of Spotify Client 97 running on Windows 98](./screenshot98.png)

![Screenshot of Spotify Client 97 running on Windows XP](/screenshotXP.png)
![Screenshot of Spotify Client 97 running on Windows XP](./screenshotXP.png)

![Screenshot of Spotify 97 Mac Edition running on OS X](./screenshotMac.png)

Expand Down
14 changes: 9 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ title: Spotify 97
description: Spotify 97 is a client-server setup for controlling Spotify Connect endpoints from vintage operating systems
remote_theme: queenkjuul/jekyll-98
include:
- docs/index.md
- docs/server/index.md
- docs/client/index.md
- docs/client/SpotifyClient97/index.md
- docs/client/Spotify97MacEdition/index.md
- index.md
- server/index.md
- client/index.md
- client/SpotifyClient97/index.md
- client/Spotify97MacEdition/index.md
defaults:
- scope:
path: "" # an empty string here means all files in the project
Expand Down Expand Up @@ -35,6 +35,10 @@ jekyll-98:
target: _self
icon: sound
alt: Spotify 97 for Mac OS 8.6 - 10.5
- title: Retro Compatible Downloads
url: http://retro.queenkjuul.xyz/spotify97/downloads
icon: links
alt: Spotify 97 Downloads hosted via plain HTTP

social_links:
github: queenkjuul/spotify97
Expand Down
1 change: 0 additions & 1 deletion docs/client/Spotify97MacEdition/index.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/client/SpotifyClient97/index.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/client/index.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/index.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/server/index.md

This file was deleted.

Loading
Loading