Merge pull request #157 from alexballas/devel

v2.5.0

Author: alexballas

.github/workflows/build-android.yml

@@ -15,23 +15,46 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
-    - name: Install fyne
-      run: go install github.com/alexballas/refyne/v2/cmd/fyne@latest
+    # No "install fyne" step: `make android` provisions the packaging CLI itself,
+    # at the refyne version go.mod pins. Installing @latest here resolved to the
+    # newest release tag, which is older than the commit the app compiles against,
+    # so the APK would ship without the Java that backs the share target.
 
     - name: Download Android SDK
       run: |
         wget https://dl.google.com/android/repository/android-ndk-r27d-linux.zip
         unzip android-ndk-r27d-linux.zip
 
     - name: Package (Android)
+      env:
+        # Without a persistent key `make android` mints a throwaway one per run,
+        # and Android refuses to install a build over one signed by a different
+        # key. Unset on forks, where secrets are unavailable; those builds are
+        # still useful for testing, they just cannot upgrade an install.
+        ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+        ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
       run: |
         # Resolve the absolute path for the NDK
         APATH=$(readlink -f android-ndk-r27d)
 
-        # Keep Go code version parity with app-version.
-        sed -i "s/version      = \"dev\"/version      = \"$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')\"/" cmd/go2tv/go2tv.go
+        if [ -n "$ANDROID_KEYSTORE_BASE64" ]; then
+          if [ -z "$ANDROID_KEYSTORE_PASSWORD" ]; then
+            echo "ANDROID_KEYSTORE_BASE64 is set but ANDROID_KEYSTORE_PASSWORD is not"
+            exit 1
+          fi
+          # RUNNER_TEMP is outside the workspace, so the key cannot reach an artifact.
+          export GO2TV_ANDROID_KEYSTORE="$RUNNER_TEMP/release.keystore"
+          printf '%s' "$ANDROID_KEYSTORE_BASE64" | tr -d '\n\r' | base64 -d > "$GO2TV_ANDROID_KEYSTORE"
+          export GO2TV_ANDROID_KEYSTORE_PASS="$ANDROID_KEYSTORE_PASSWORD"
+          export GO2TV_ANDROID_KEY_ALIAS="${ANDROID_KEY_ALIAS:-go2tv}"
+          export GO2TV_ANDROID_KEY_PASS="${ANDROID_KEY_PASSWORD:-$ANDROID_KEYSTORE_PASSWORD}"
+        else
+          echo "::warning::No release keystore secret is configured, so this APK is signed with a throwaway key and cannot be installed over an existing go2tv."
+        fi
 
         ANDROID_NDK_HOME=$APATH make android
         cp build/Go2TV.apk Go2TV.apk

.github/workflows/build-appimage.yml

@@ -15,7 +15,7 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Get dependencies
       run: sudo apt update && sudo apt install -y xorg-dev libwayland-dev libxkbcommon-dev libegl-dev libpipewire-0.3-dev pkg-config curl wget tar xz-utils libfuse2t64

.github/workflows/build-arm.yml

@@ -24,12 +24,12 @@ jobs:
             sudo apt install -y xorg-dev libwayland-dev libxkbcommon-dev libegl-dev libpipewire-0.3-dev pkg-config
             sudo apt clean
             sudo rm -rf /var/lib/apt/lists/*
-            wget -nv https://go.dev/dl/go1.25.1.linux-armv6l.tar.gz
-            tar -xzf go1.25.1.linux-armv6l.tar.gz
-            rm go1.25.1.linux-armv6l.tar.gz
+            wget -nv https://go.dev/dl/go1.26.0.linux-armv6l.tar.gz
+            tar -xzf go1.26.0.linux-armv6l.tar.gz
+            rm go1.26.0.linux-armv6l.tar.gz
             export GOROOT=/go
             cd /go2tv_dir
-            /go/bin/go build -tags migrated_fynedo -ldflags "-s -w -X main.version=$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')" -o go2tv cmd/go2tv/go2tv.go
+            /go/bin/go build -tags migrated_fynedo -ldflags "-s -w" -o go2tv ./cmd/go2tv
 
     - uses: actions/upload-artifact@v6
       with:

.github/workflows/build-arm64.yml

@@ -15,13 +15,13 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Get dependencies
       run: sudo apt update && sudo apt install -y xorg-dev libwayland-dev libxkbcommon-dev libegl-dev libpipewire-0.3-dev pkg-config
 
     - name: Package (Linux)
-      run: go build -tags migrated_fynedo -ldflags "-s -w -X main.version=$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')" -o go2tv cmd/go2tv/go2tv.go
+      run: go build -tags migrated_fynedo -ldflags "-s -w" -o go2tv ./cmd/go2tv
 
     - uses: actions/upload-artifact@v6
       with:

.github/workflows/build-linux.yml

@@ -15,13 +15,13 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Get dependencies
       run: sudo apt update && sudo apt install -y xorg-dev libwayland-dev libxkbcommon-dev libegl-dev libpipewire-0.3-dev pkg-config
 
     - name: Package (Linux)
-      run: GOOS=linux GOARCH=amd64 go build -tags migrated_fynedo -ldflags "-s -w -X main.version=$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')" -o go2tv cmd/go2tv/go2tv.go
+      run: GOOS=linux GOARCH=amd64 go build -tags migrated_fynedo -ldflags "-s -w" -o go2tv ./cmd/go2tv
 
     - uses: actions/upload-artifact@v6
       with:

.github/workflows/build-mac-intel.yml

@@ -15,19 +15,16 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Install refyne
       run: go install github.com/alexballas/refyne/v2/cmd/fyne@latest
 
-    - name: Update FyneApp.toml version
-      run: sed -i '' "s/^Version.*/Version = \"$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')\"/" cmd/go2tv/FyneApp.toml
-
     - name: Package (macOS)
       run: |
+        APP_BUILD="$(make print-app-build)"
         cd cmd/go2tv
-        sed -i '' "s/version      = \"dev\"/version      = \"$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')\"/" go2tv.go
-        CGO_CFLAGS="-mmacosx-version-min=12.3" CGO_LDFLAGS="-mmacosx-version-min=12.3" MACOSX_DEPLOYMENT_TARGET=12.3 GOARCH=amd64 fyne package --release --os darwin --icon ../../assets/go2tv-icon.png
+        CGO_CFLAGS="-mmacosx-version-min=12.3" CGO_LDFLAGS="-mmacosx-version-min=12.3" MACOSX_DEPLOYMENT_TARGET=12.3 GOARCH=amd64 fyne package --release --os darwin --app-version "${GO2TV_VERSION#v}" --app-build "$APP_BUILD" --icon ../../assets/go2tv-icon.png
         mv go2tv.app ../../
 
     - uses: actions/upload-artifact@v6

.github/workflows/build-mac.yml

@@ -15,19 +15,16 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Install refyne
       run: go install github.com/alexballas/refyne/v2/cmd/fyne@latest
 
-    - name: Update FyneApp.toml version
-      run: sed -i '' "s/^Version.*/Version = \"$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')\"/" cmd/go2tv/FyneApp.toml
-
     - name: Package (macOS)
       run: |
+        APP_BUILD="$(make print-app-build)"
         cd cmd/go2tv
-        sed -i '' "s/version      = \"dev\"/version      = \"$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')\"/" go2tv.go
-        CGO_CFLAGS="-mmacosx-version-min=12.3" CGO_LDFLAGS="-mmacosx-version-min=12.3" MACOSX_DEPLOYMENT_TARGET=12.3 GOARCH=arm64 fyne package --release --os darwin --icon ../../assets/go2tv-icon.png
+        CGO_CFLAGS="-mmacosx-version-min=12.3" CGO_LDFLAGS="-mmacosx-version-min=12.3" MACOSX_DEPLOYMENT_TARGET=12.3 GOARCH=arm64 fyne package --release --os darwin --app-version "${GO2TV_VERSION#v}" --app-build "$APP_BUILD" --icon ../../assets/go2tv-icon.png
         mv go2tv.app ../../
 
     - uses: actions/upload-artifact@v6

.github/workflows/build-windows.yml

@@ -21,8 +21,9 @@ jobs:
           go2tv_version="v$version"
         fi
 
-        windows_app_version="$(printf '%s\n' "$version" | sed -n 's/^\([0-9][0-9.]*\).*/\1/p')"
-        if [ -z "$windows_app_version" ]; then
+        if [[ "$version" =~ ^([0-9]+([.][0-9]+)*) ]]; then
+          windows_app_version="${BASH_REMATCH[1]}"
+        else
           windows_app_version="0.0.0"
         fi
 
@@ -37,7 +38,7 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Setup MSYS2
       uses: msys2/setup-msys2@v2
@@ -50,22 +51,24 @@ jobs:
           mingw-w64-x86_64-cppwinrt
           mingw-w64-x86_64-pkg-config
 
-    - name: Update FyneApp.toml version
-      shell: msys2 {0}
-      run: sed -i "s/^Version.*/Version = \"$GO2TV_WINDOWS_APP_VERSION\"/" cmd/go2tv/FyneApp.toml
-
     - name: Package (Windows)
       shell: msys2 {0}
       run: |
         cd cmd/go2tv
-        sed -i "s/version      = \"dev\"/version      = \"$(printf '%s\n' "$GO2TV_VERSION" | sed 's/^v//')\"/" go2tv.go
         CC_BIN="$(command -v x86_64-w64-mingw32-gcc-win32 || command -v gcc)"
         CXX_BIN="$(command -v x86_64-w64-mingw32-g++-win32 || command -v g++)"
         CGO_ENABLED=1 CC="$CC_BIN" CXX="$CXX_BIN" CGO_LDFLAGS="-static -static-libgcc -static-libstdc++ -Wl,-Bstatic -l:libstdc++.a -l:libwinpthread.a" GOFLAGS="-ldflags=-linkmode=external -ldflags=-extldflags=-static" go run github.com/alexballas/refyne/v2/cmd/fyne@latest package --release --app-id app.go2tv.go2tv --app-version "$GO2TV_WINDOWS_APP_VERSION" --os windows --icon ../../assets/go2tv-icon-desktop-256.png
         objdump -p go2tv.exe | grep "DLL Name" | tee /tmp/go2tv-imports.txt
         ! grep -Eq "libwinpthread-1.dll|libstdc\+\+-6.dll" /tmp/go2tv-imports.txt
         mv go2tv.exe ../../
 
+    - name: Build lite (Windows)
+      shell: bash
+      run: |
+        CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build \
+          -trimpath -ldflags "-s -w" \
+          -o go2tv-lite.exe ./cmd/go2tv-lite
+
     - uses: actions/upload-artifact@v6
       with:
         name: go2tv_${{ steps.version.outputs.go2tv_version }}_windows_amd64
@@ -74,3 +77,12 @@ jobs:
           README.md
           go2tv.exe
         retention-days: 2
+
+    - uses: actions/upload-artifact@v6
+      with:
+        name: go2tv_${{ steps.version.outputs.go2tv_version }}_windows_amd64_lite
+        path: |
+          LICENSE
+          README.md
+          go2tv-lite.exe
+        retention-days: 2

.github/workflows/go.yml

@@ -10,13 +10,44 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Install Linux deps
       run: sudo apt update && sudo apt install -y xorg-dev libwayland-dev libxkbcommon-dev libegl-dev libpipewire-0.3-dev pkg-config
 
     - name: Build
       run: go build -v ./...
-    
+
     - name: Test
-      run: go test -v ./...
+      # The pipewire pkg-config exposes -fno-strict-overflow, which cgo rejects
+      # unless it is explicitly allowed. Required to link the GUI package under -race.
+      env:
+        CGO_CFLAGS_ALLOW: -fno-strict-overflow
+      run: go test -race -v ./...
+
+  webui:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+
+    - uses: actions/setup-node@v5
+      with:
+        node-version: 22
+        cache: npm
+
+    - name: Install web deps
+      run: npm ci
+
+    - name: Test
+      run: npm test
+
+    - name: Verify dist matches src
+      # internal/webui/dist is committed and embedded into the Go binary, so a
+      # rebuild must be a no-op. Otherwise the shipped UI silently lags its source.
+      run: |
+        npm run build:webui
+        if [ -n "$(git status --porcelain internal/webui/dist)" ]; then
+          echo "internal/webui/dist is stale. Run 'npm run build:webui' and commit the result."
+          git status --porcelain internal/webui/dist
+          exit 1
+        fi

.github/workflows/release-draft.yml

@@ -35,7 +35,7 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: 'stable'
+        go-version-file: go.mod
 
     - name: Normalize version
       id: version
@@ -88,6 +88,7 @@ jobs:
             `go2tv_${versionTag}_macOS_amd64`,
             `go2tv_${versionTag}_macOS_arm64`,
             `go2tv_${versionTag}_windows_amd64`,
+            `go2tv_${versionTag}_windows_amd64_lite`,
           ];
 
           const candidates = artifacts.filter((artifact) => {