From 24cd3ecf7e933425def3f4d286d87d18cb9d32ce Mon Sep 17 00:00:00 2001 From: PaddiM8 Date: Tue, 25 May 2021 09:09:25 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9fb730d..2b1bda7 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ Kalk is a calculator (both program and library) that supports user-defined varia There are currently three different libraries related to kalk. * [kalk](https://crates.io/crates/kalk): The Rust crate that powers it all. -* [@paddim8/kalk](https://www.npmjs.com/package/@paddim8/kalk): JavaScript bindings to `kalk`. This lets you use it in the browser, thanks to WebAssembly. -* [@paddim8/kalk-component](https://www.npmjs.com/package/@paddim8/kalk-component): A web component that acts as a frontend to `@paddim8/kalk`, which lets you use kalk in the browser with a command line-like interface. +* [@paddim8/kalk](https://www.npmjs.com/package/@paddim8/kalk): JavaScript bindings for `kalk`. This lets you use it in the browser thanks to WebAssembly. +* [@paddim8/kalk-component](https://www.npmjs.com/package/@paddim8/kalk-component): A web component that runs `@paddim8/kalk`, which let's you use kalk in the browser with a command line-like interface. ## Installation From d24b48bd732843f024662eaba6d90adcabf8d63a Mon Sep 17 00:00:00 2001 From: PaddiM8 Date: Tue, 25 May 2021 14:53:19 +0200 Subject: [PATCH 2/2] Added android release to CI --- .github/workflows/release.yml | 42 +++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c55868f..8bf467f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,6 @@ jobs: registry-url: https://registry.npmjs.org/ - name: Install wasm-pack run: cargo install --git https://github.com/rustwasm/wasm-pack.git --rev d46d1c69b788956160deed5e4e603f4f2780ffcf - #run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Build run: | yarn install @@ -135,10 +134,49 @@ jobs: name: binaries path: kalk_cli/target/wix/kalk-windows.msi + release_android: + name: release android + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./kalk_mobile + + steps: + - uses: actions/checkout@master + - uses: actions/cache@v2 + with: + path: | + kalk_mobile/android/.gradle + kalk_mobile/android/build + kalk_mobile/android/app/build + key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + - name: npm + run: | + npm install + npm run build + - name: build app + run: | + npx cap sync + cd android + ./gradlew assembleRelease + - uses: r0adkll/sign-android-release@v1 + name: sign apk + with: + releaseDirectory: kalk_mobile/android/app/build/outputs/apk/release + signingKeyBase64: ${{ secrets.SIGNING_KEY }} + alias: ${{ secrets.ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} + - run: mv android/app/build/outputs/apk/release/app-release-unsigned-signed.apk ./kalk-android.apk + - uses: actions/upload-artifact@v2 + with: + name: binaries + path: kalk_mobile/kalk-android.apk + create_release: name: Create Release if: always() - needs: [release_linux, release_mac, release_windows] + needs: [release_linux, release_mac, release_windows, release_android] runs-on: ubuntu-latest steps: - name: Create Release