Compare commits

..

No commits in common. "b26928a8a005be983c1421fc00d09dc1ab47dbb3" and "f012defd7991d9d9760084ab87f426f88b530560" have entirely different histories.

3 changed files with 62 additions and 134 deletions

View File

@ -1,21 +1,7 @@
name: Release name: Build All Platforms
on: on:
workflow_dispatch: workflow_dispatch:
inputs:
release_type:
description: 'Release type'
required: true
type: choice
default: 'stable'
options:
- stable
- nightly
dry_run:
description: 'Dry run (build & upload artifacts only, skip creating release)'
required: false
type: boolean
default: false
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
@ -36,14 +22,13 @@ jobs:
with: with:
repository: ${{ env.COMPOSE_WEBVIEW_REPO }} repository: ${{ env.COMPOSE_WEBVIEW_REPO }}
ref: ${{ env.COMPOSE_WEBVIEW_COMMIT }} ref: ${{ env.COMPOSE_WEBVIEW_COMMIT }}
token: ${{ secrets.GITHUB_TOKEN }}
path: compose-webview path: compose-webview
- name: Checkout gradle-plugin - name: Checkout gradle-plugin
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: ${{ env.GRADLE_PLUGIN_REPO }} repository: ${{ env.GRADLE_PLUGIN_REPO }}
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GH_PAT }}
path: gradle-plugin path: gradle-plugin
- name: Set up JDK 21 - name: Set up JDK 21
@ -83,14 +68,12 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: maven-local-gradle-plugin name: maven-local-gradle-plugin
path: ~/.m2/repository/dev/krtirtho/ path: ~/.m2/repository/dev/krtirtho/spotube/
build-android: build-android:
name: Android name: Android
needs: prepare-deps needs: prepare-deps
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
GRADLE_FLAGS: ${{ inputs.release_type == 'nightly' && '-PversionName=nightly' || '' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -104,7 +87,7 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: maven-local-gradle-plugin name: maven-local-gradle-plugin
path: ~/.m2/repository/dev/krtirtho/ path: ~/.m2/repository/dev/krtirtho/spotube/
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
@ -114,26 +97,8 @@ jobs:
- name: Set up Gradle - name: Set up Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Make gradlew executable
run: chmod +x gradlew
- name: Decode keystore
run: |
echo '${{ secrets.KEYSTORE }}' | base64 --decode > "${{ github.workspace }}/composeApp/upload-keystore.jks"
- name: Configure Android signing
working-directory: composeApp
run: |
cat >> local.properties <<EOF
release.signing.storeFile=${{ github.workspace }}/composeApp/upload-keystore.jks
release.signing.storePassword=${{ secrets.KEYSTORE_PASSWORD }}
release.signing.keyAlias=${{ secrets.KEYSTORE_KEY_ALIAS }}
release.signing.keyPassword=${{ secrets.KEYSTORE_KEY_PASSWORD }}
EOF
- name: Assemble Release - name: Assemble Release
run: ./gradlew :composeApp:assembleRelease ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:assembleRelease
- name: Upload APK - name: Upload APK
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -151,8 +116,6 @@ jobs:
name: Linux Desktop name: Linux Desktop
needs: prepare-deps needs: prepare-deps
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
GRADLE_FLAGS: ${{ inputs.release_type == 'nightly' && '-PversionName=nightly' || '' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -166,7 +129,7 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: maven-local-gradle-plugin name: maven-local-gradle-plugin
path: ~/.m2/repository/dev/krtirtho/ path: ~/.m2/repository/dev/krtirtho/spotube/
- name: Install packaging tools - name: Install packaging tools
run: | run: |
@ -182,17 +145,14 @@ jobs:
- name: Set up Gradle - name: Set up Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Make gradlew executable
run: chmod +x gradlew
- name: Package DEB - name: Package DEB
run: ./gradlew :composeApp:packageReleaseDeb ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:packageReleaseDeb
- name: Package RPM - name: Package RPM
run: ./gradlew :composeApp:packageReleaseRpm ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:packageReleaseRpm
- name: Package AppImage - name: Package AppImage
run: ./gradlew :composeApp:packageReleaseAppImage ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:packageReleaseAppImage
- name: Upload DEB - name: Upload DEB
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -216,8 +176,6 @@ jobs:
name: Windows Desktop name: Windows Desktop
needs: prepare-deps needs: prepare-deps
runs-on: windows-latest runs-on: windows-latest
env:
GRADLE_FLAGS: ${{ inputs.release_type == 'nightly' && '-PversionName=nightly' || '' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -231,7 +189,7 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: maven-local-gradle-plugin name: maven-local-gradle-plugin
path: ~/.m2/repository/dev/krtirtho/ path: ~/.m2/repository/dev/krtirtho/spotube/
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
@ -243,10 +201,10 @@ jobs:
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Package MSI - name: Package MSI
run: ./gradlew :composeApp:packageReleaseMsi ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:packageReleaseMsi
- name: Package EXE - name: Package EXE
run: ./gradlew :composeApp:packageReleaseExe ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:packageReleaseExe
- name: Upload MSI - name: Upload MSI
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -264,8 +222,6 @@ jobs:
name: macOS Desktop name: macOS Desktop
needs: prepare-deps needs: prepare-deps
runs-on: macos-latest runs-on: macos-latest
env:
GRADLE_FLAGS: ${{ inputs.release_type == 'nightly' && '-PversionName=nightly' || '' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -279,7 +235,7 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: maven-local-gradle-plugin name: maven-local-gradle-plugin
path: ~/.m2/repository/dev/krtirtho/ path: ~/.m2/repository/dev/krtirtho/spotube/
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
@ -290,11 +246,8 @@ jobs:
- name: Set up Gradle - name: Set up Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Make gradlew executable
run: chmod +x gradlew
- name: Package DMG - name: Package DMG
run: ./gradlew :composeApp:packageReleaseDmg ${{ env.GRADLE_FLAGS }} run: ./gradlew :composeApp:packageReleaseDmg
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -302,67 +255,53 @@ jobs:
name: macos-dmg name: macos-dmg
path: composeApp/build/compose/binaries/main-release/**/*.dmg path: composeApp/build/compose/binaries/main-release/**/*.dmg
create-release: build-ios:
name: Create GitHub Release name: iOS
if: ${{ !inputs.dry_run }} needs: prepare-deps
needs: runs-on: macos-latest
- build-android
- build-linux
- build-windows
- build-macos
runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set release variables - name: Download compose-webview artifacts
id: vars
run: |
if [ "${{ inputs.release_type }}" = "stable" ]; then
VERSION=$(grep 'versionName' composeApp/build.gradle.kts | head -1 | sed 's/.*"\(.*\)".*/\1/')
TAG="v${VERSION}"
echo "is_prerelease=false" >> "$GITHUB_OUTPUT"
echo "is_draft=true" >> "$GITHUB_OUTPUT"
echo "release_name=Spotube ${TAG}" >> "$GITHUB_OUTPUT"
else
TAG="nightly"
VERSION="$(date +%Y-%m-%d)"
echo "is_prerelease=true" >> "$GITHUB_OUTPUT"
echo "is_draft=false" >> "$GITHUB_OUTPUT"
echo "release_name=Nightly ${VERSION}" >> "$GITHUB_OUTPUT"
fi
echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
- name: Download all artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
- name: Generate release notes
run: |
echo "## Downloads" > release-notes.md
echo "" >> release-notes.md
for dir in android-apk android-aab linux-deb linux-rpm linux-appimage windows-msi windows-exe macos-dmg; do
if [ -d "$dir" ]; then
echo "### $dir" >> release-notes.md
for f in "$dir"/*; do
echo "- \`$(basename "$f")\`" >> release-notes.md
done
echo "" >> release-notes.md
fi
done
- name: Create Release
uses: softprops/action-gh-release@v2
with: with:
tag_name: ${{ steps.vars.outputs.tag }} name: maven-local-composewebview
name: ${{ steps.vars.outputs.release_name }} path: ~/.m2/repository/io/github/kdroidfilter/
body_path: release-notes.md
draft: ${{ steps.vars.outputs.is_draft }} - name: Download gradle-plugin artifacts
prerelease: ${{ steps.vars.outputs.is_prerelease }} uses: actions/download-artifact@v4
files: | with:
android-apk/*.apk name: maven-local-gradle-plugin
android-aab/*.aab path: ~/.m2/repository/dev/krtirtho/spotube/
linux-deb/*.deb
linux-rpm/*.rpm - name: Set up JDK 21
linux-appimage/*.AppImage uses: actions/setup-java@v4
windows-msi/*.msi with:
windows-exe/*.exe distribution: temurin
macos-dmg/*.dmg java-version: 21
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build Kotlin framework
run: ./gradlew :composeApp:linkReleaseFrameworkIosArm64
- name: Build iOS app
run: |
xcodebuild \
-project iosApp/iosApp.xcodeproj \
-scheme iosApp \
-sdk iphoneos \
-configuration Release \
-destination 'generic/platform=iOS' \
CODE_SIGN_IDENTITY="" \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGNING_ALLOWED=NO \
CONFIGURATION_BUILD_DIR="${{ github.workspace }}/build/ios" \
build
- name: Upload .app
uses: actions/upload-artifact@v4
with:
name: ios-app
path: build/ios/*.app

View File

@ -41,14 +41,3 @@
## Current testing reality ## Current testing reality
- No committed `*Test*.kt` files; test tasks may run zero tests unless new tests are added. - No committed `*Test*.kt` files; test tasks may run zero tests unless new tests are added.
## Release workflow (`.github/workflows/release.yml`)
- Triggered by `workflow_dispatch` with a `release_type` choice input (`stable` | `nightly`).
- `prepare-deps` job checks out & publishes to `mavenLocal`:
- `kdroidFilter/ComposeNativeWebview` (compose-webview)
- `team-spotube/gradle-plugin` (spotubeGradle + vlcjBundler plugins)
- Build jobs per platform (Android, Linux, Windows, macOS), all `needs: prepare-deps`.
- **Stable**: reads `versionName` from `composeApp/build.gradle.kts`, tag = `v{version}`, draft release.
- **Nightly**: builds with `-PversionName=nightly`, tag = `nightly` (updates existing), prerelease.
- **Android signing**: decodes `secrets.KEYSTORE` (base64) → `composeApp/upload-keystore.jks`, writes signing config into `local.properties` from secrets.
- `create-release` job (depends on all builds) uses `softprops/action-gh-release@v2` to create the GitHub release with all artifacts attached.

View File

@ -228,7 +228,7 @@ android {
minSdk = libs.versions.android.minSdk.get().toInt() minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt()
versionCode = 1 versionCode = 1
versionName = project.findProperty("versionName") as String? ?: "1.0" versionName = "1.0"
} }
packaging { packaging {
resources { resources {
@ -289,7 +289,7 @@ compose.desktop {
nativeDistributions { nativeDistributions {
packageName = "dev.krtirtho.spotube" packageName = "dev.krtirtho.spotube"
packageVersion = project.findProperty("versionName") as String? ?: "6.0.0" packageVersion = "6.0.0"
licenseFile = project.file("../LICENSE") licenseFile = project.file("../LICENSE")
targetFormats( targetFormats(