diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index 0768ce8..0f1fb80 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -5,12 +5,10 @@ # release are moved to it, so both of these always get the newest version: # curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/download/steamify.sh | bash # curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/download/latest/steamify.sh | bash -# Each release also has the app (v2): steamify-app.tar.gz (ui/, steamify.sh, +# Each release also has the app: steamify-app.tar.gz (ui/, steamify.sh, # lib/, patches/, services/, the icon) and its launcher, run with: # curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/download/steamify-app.sh | bash -# A push to feat/v2-ui (the app, not released yet) updates the pre-release -# v2-ui-preview instead, whose launcher gets that build: -# curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/download/v2-ui-preview/steamify-app.sh | bash +# Pushes to release/** build and check it like pull requests; only main publishes. # Pull requests only build and check it, and warn when VERSION is already released. name: Single-file build @@ -106,23 +104,3 @@ jobs: gh release create latest --title "Steamify CachyOS - latest (v$VERSION)" --notes "$latest_notes" --latest=false fi gh release upload latest dist/steamify.sh dist/steamify-app.sh dist/steamify-app.tar.gz assets/steam-gaming-settings.svg --clobber - - - name: Publish the v2-ui-preview pre-release - if: github.event_name == 'push' && github.ref == 'refs/heads/feat/v2-ui' - env: - GH_TOKEN: ${{ github.token }} - run: | - # Its launcher downloads this pre-release, not the newest release. - sed -i 's/STEAMIFY_RELEASE:-latest/STEAMIFY_RELEASE:-v2-ui-preview/' dist/steamify-app.sh - grep -q 'STEAMIFY_RELEASE:-v2-ui-preview' dist/steamify-app.sh - git tag -f v2-ui-preview "$GITHUB_SHA" && git push -f origin v2-ui-preview - notes="Preview of the Steamify app (v2) from feat/v2-ui ($(git describe --always), $(git log -1 --format='%cs %s')). Not a release. - Run it with: - - curl -fsSL https://github.com/${{ github.repository }}/releases/download/v2-ui-preview/steamify-app.sh | bash" - if gh release view v2-ui-preview >/dev/null 2>&1; then - gh release edit v2-ui-preview --title "Steamify app (v2) preview" --notes "$notes" --prerelease --latest=false - else - gh release create v2-ui-preview --target "$GITHUB_SHA" --title "Steamify app (v2) preview" --notes "$notes" --prerelease --latest=false - fi - gh release upload v2-ui-preview dist/steamify-app.sh dist/steamify-app.tar.gz --clobber diff --git a/CHANGELOG.md b/CHANGELOG.md index b533d0e..388b47e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,8 @@ one per merged pull request. - `eadbdda` **docs: release branches (release/X.Y.Z, feature/ and bugfix/ branches into it, the release into main); CI builds release/** pushes** - `bee18b7` **docs: the agent merges feature/bugfix branches into the release branch; the release into main stays the user's** - `501c0ba` **docs: gh or git for merging into the release branch** -- **docs: gh is required for the release-branch pull requests; ask the user to install it** +- `b1adacb` **docs: gh is required for the release-branch pull requests; ask the user to install it** +- **chore: the v2 app preview is gone (it is the released app): no preview pre-release step in CI, no mention in steamify-app.sh** ## 2.6.0 - 2026-09-27 diff --git a/ui/steamify-app.sh b/ui/steamify-app.sh index 95f428b..fd3c012 100755 --- a/ui/steamify-app.sh +++ b/ui/steamify-app.sh @@ -1,12 +1,12 @@ #!/bin/bash -# Steamify CachyOS - get and start the app (v2), for `curl | bash`: +# Steamify CachyOS - get and start the app, for `curl | bash`: # curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/download/steamify-app.sh | bash # Downloads the newest release's app package (steamify-app.tar.gz: the app, # steamify.sh, lib/, patches/ and services/) to ~/.local/share/steamify/app, installs PySide6 if # it's missing, adds a launcher entry, and starts the app. -# STEAMIFY_RELEASE= takes that release instead of the newest (the -# v2-ui-preview build's copy of this script sets it). STEAMIFY_BRANCH= -# takes that branch's source instead (for testing before a build). +# STEAMIFY_RELEASE= takes that release instead of the newest. +# STEAMIFY_BRANCH= takes that branch's source instead (for testing +# before a build). set -euo pipefail REPO="theupriser/steamify-cachyos"