Skip to content
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
11 changes: 2 additions & 9 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Run Android unit tests and lint, then build APK
working-directory: android
env:
OPENSTREAM_VERSION_NAME: 2.0.0-beta.${{ steps.version.outputs.code }}
OPENSTREAM_VERSION_NAME: 1.0.0
OPENSTREAM_VERSION_CODE: ${{ steps.version.outputs.code }}
run: |
chmod +x ./gradlew
Expand All @@ -61,13 +61,7 @@ jobs:
mkdir -p dist
cp android/app/build/outputs/apk/debug/app-debug.apk dist/openstream-android.apk
(cd dist && sha256sum openstream-android.apk > openstream-android.apk.sha256)
APK_SHA256="$(cut -d ' ' -f 1 dist/openstream-android.apk.sha256)"
printf 'debug-signed-beta\n' > dist/android-signing.txt
printf '{\n "versionName": "2.0.0-beta.%s",\n "versionCode": %s,\n "apkAsset": "openstream-android.apk",\n "apkSha256": "%s"\n}\n' \
"${{ steps.version.outputs.code }}" \
"${{ steps.version.outputs.code }}" \
"$APK_SHA256" \
> dist/openstream-android-update.json
printf 'debug-signed\n' > dist/android-signing.txt

- name: Upload APK
uses: actions/upload-artifact@v4
Expand All @@ -77,5 +71,4 @@ jobs:
dist/openstream-android.apk
dist/openstream-android.apk.sha256
dist/android-signing.txt
dist/openstream-android-update.json
if-no-files-found: error
16 changes: 1 addition & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
inputs:
tag:
description: Release tag, for example v0.1.0
description: Release tag, for example v1.0.0
required: true
type: string

Expand Down Expand Up @@ -90,21 +90,10 @@ jobs:
./gradlew --no-daemon :app:assembleRelease

- name: Normalize Android APK artifact
env:
RELEASE_VERSION_NAME: ${{ inputs.tag || github.ref_name }}
RELEASE_VERSION_CODE: ${{ steps.version.outputs.code }}
run: |
mkdir -p dist
cp android/app/build/outputs/apk/release/app-release.apk dist/openstream-android.apk
(cd dist && sha256sum openstream-android.apk > openstream-android.apk.sha256)
APK_SHA256="$(cut -d ' ' -f 1 dist/openstream-android.apk.sha256)"
VERSION_NAME="$RELEASE_VERSION_NAME"
VERSION_NAME="${VERSION_NAME#v}"
printf '{\n "versionName": "%s",\n "versionCode": %s,\n "apkAsset": "openstream-android.apk",\n "apkSha256": "%s"\n}\n' \
"$VERSION_NAME" \
"$RELEASE_VERSION_CODE" \
"$APK_SHA256" \
> dist/openstream-android-update.json

- name: Upload APK artifact
uses: actions/upload-artifact@v4
Expand All @@ -113,7 +102,6 @@ jobs:
path: |
dist/openstream-android.apk
dist/openstream-android.apk.sha256
dist/openstream-android-update.json
if-no-files-found: error

obs-plugin:
Expand Down Expand Up @@ -223,7 +211,6 @@ jobs:
run: |
test -f dist/openstream-android.apk
test -f dist/openstream-android.apk.sha256
test -f dist/openstream-android-update.json
test -f dist/openstream-obs-plugin-installer-windows-x64.exe
test -f dist/openstream-obs-windows-x64.zip

Expand All @@ -236,7 +223,6 @@ jobs:
gh release create "$TAG_NAME" \
dist/openstream-android.apk \
dist/openstream-android.apk.sha256 \
dist/openstream-android-update.json \
dist/openstream-obs-plugin-installer-windows-x64.exe \
dist/openstream-obs-windows-x64.zip \
--target "$GITHUB_SHA" \
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/v4-windows-foundation.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ android/build/
android/app/build/
android/app/.cxx/

build/
out/
CMakeUserPresets.json

__pycache__/
*.py[cod]
Expand All @@ -43,5 +41,3 @@ artifacts-local/
website/node_modules/
website/dist/
aqtinstall.log
/.phase0-smoke/
/.phase0-smoke-*.log
27 changes: 0 additions & 27 deletions CMakeLists.txt

This file was deleted.

69 changes: 0 additions & 69 deletions CMakePresets.json

This file was deleted.

22 changes: 0 additions & 22 deletions CMakeUserPresets.json.example

This file was deleted.

Loading
Loading