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

Sign Android builds when packaging. #58

Merged
merged 1 commit into from
Jul 14, 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
28 changes: 17 additions & 11 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,40 @@ jobs:
package-linux:
runs-on: ubuntu-24.04
env:
PACKAGE_NAME: NovaSwarm-x64-linux-v0.1.0.zip
PACKAGE_NAME: NovaSwarm-x64-linux-${{ github.ref_name }}.zip
steps:
- uses: actions/checkout@v4
- name: init
run: sudo apt update -yqq && sudo apt install -yqq ninja-build xorg-dev libpulse-dev libkpipewire-dev
- name: package release
run: cmake -DPACKAGE_NAME=${{ env.PACKAGE_NAME }} -P tools/package_release.cmake
run: cmake -DPACKAGE_NAME="${{ env.PACKAGE_NAME }}" -P tools/package_release.cmake
- name: upload release
uses: softprops/action-gh-release@v2
with:
files: ${{ env.PACKAGE_NAME }}
files: "${{ env.PACKAGE_NAME }}"
draft: true
fail_on_unmatched_files: true
package-windows:
runs-on: windows-latest
env:
PACKAGE_NAME: NovaSwarm-x64-windows-v0.1.0.zip
PACKAGE_NAME: NovaSwarm-x64-windows-${{ github.ref_name }}.zip
steps:
- uses: actions/checkout@v4
- name: package release
run: cmake -DPACKAGE_NAME="${{ env.PACKAGE_NAME }}" -P tools/package_release.cmake
- name: upload release
uses: softprops/action-gh-release@v2
with:
files: ${{ env.PACKAGE_NAME }}
files: "${{ env.PACKAGE_NAME }}"
draft: true
fail_on_unmatched_files: true
package-android:
env:
PACKAGE_NAME: NovaSwarm-arm64-android-v0.1.0.apk
PACKAGE_NAME: NovaSwarm-arm64-android-${{ github.ref_name }}.apk
SIGN_ARGS: >
-Pandroid.injected.signing.key.alias=${{ secrets.ANDROID_KEYSTORE_ALIAS }}
-Pandroid.injected.signing.store.password=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
-Pandroid.injected.signing.key.password=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
Expand All @@ -46,22 +50,24 @@ jobs:
tar xvzf jdk-17_linux-x64_bin.tar.gz -C /opt
- name: build APK
run: |
echo ${{ secrets.ANDROID_KEYSTORE_BASE64 }} | base64 -d > keystore.jks
export KEYSTORE_PATH=$(pwd)/keystore.jks
export JAVA_HOME=$(find /opt -name "jdk-17.*")
cd src/android
./gradlew assembleRelease
mv app/build/outputs/apk/release/app-release-unsigned.apk ../../$PACKAGE_NAME
./gradlew assembleRelease -Pandroid.injected.signing.store.file=$KEYSTORE_PATH $SIGN_ARGS
mv app/build/outputs/apk/release/app-release.apk ../../$PACKAGE_NAME
- name: upload release
uses: softprops/action-gh-release@v2
with:
files: ${{ env.PACKAGE_NAME }}
files: "${{ env.PACKAGE_NAME }}"
draft: true
fail_on_unmatched_files: true
package-macos:
runs-on: macos-latest
env:
CPU_ARCH: arm64
OS_NAME: macos
PACKAGE_NAME: NovaSwarm-arm64-macos-v0.1.0.zip
PACKAGE_NAME: NovaSwarm-arm64-macos-${{ github.ref_name }}.zip
steps:
- uses: actions/checkout@v4
- name: init
Expand All @@ -71,7 +77,7 @@ jobs:
- name: upload release
uses: softprops/action-gh-release@v2
with:
files: ${{ env.PACKAGE_NAME }}
files: "${{ env.PACKAGE_NAME }}"
draft: true
fail_on_unmatched_files: true

2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ message(STATUS "spaced build version: ${build_version}")

project(spaced VERSION ${build_version})

configure_file(src/package.yml.in "${CMAKE_CURRENT_SOURCE_DIR}/.github/workflows/package.yml" @ONLY)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
1. Android:
1. arm64 (64 bit ARM) or x64 (64 bit Intel/AMD).

*Note: Adreno GPUs on Android seem to have driver bugs that cause rendering artifacts and can sometimes crash the app.*
*Note: Some GPUs on Android seem to have driver bugs that cause rendering artifacts and can sometimes crash the app.*

### Steps

Expand Down
77 changes: 0 additions & 77 deletions src/package.yml.in

This file was deleted.