Skip to content

Commit

Permalink
temp changes for PR: yggdrasil-network/yggdrasil-go#1063 and branch b…
Browse files Browse the repository at this point in the history
…uild
  • Loading branch information
aakselrod committed Oct 10, 2023
1 parent c457021 commit d492dfe
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build

on:
push:
branches: [ "main" ]
branches: [ "ble-support" ]
pull_request:
branches: [ "main" ]
branches: [ "ble-support" ]
workflow_dispatch:
release:
types: [published]
Expand All @@ -21,9 +21,9 @@ jobs:
- name: Check out Yggdrasil
uses: actions/checkout@v3
with:
repository: yggdrasil-network/yggdrasil-go
repository: aakselrod/yggdrasil-go
path: yggdrasil-go
ref: develop
ref: mobile-listen
fetch-depth: 0

- name: Setup Go environment
Expand Down Expand Up @@ -58,21 +58,21 @@ jobs:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}

- name: Gradle build
if: github.event_name != 'release' && github.ref_name != 'main'
if: github.event_name != 'release' && github.ref_name != 'ble-support'
run: |
chmod +x gradlew
./gradlew buildRelease
- name: Gradle signed build
if: github.event_name == 'release' || github.ref_name == 'main'
if: github.event_name == 'release' || github.ref_name == 'ble-support'
run: |
echo "${{ secrets.RELEASE_KEYSTORE }}" > app/gha.keystore.asc
gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch app/gha.keystore.asc > app/gha.jks
chmod +x gradlew
./gradlew assembleYggdrasil
- name: Upload build artifact
if: github.event_name == 'release' || github.ref_name == 'main'
if: github.event_name == 'release' || github.ref_name == 'ble-support'
uses: actions/upload-artifact@v3
with:
name: yggdrasil-android
Expand Down
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "libs/yggdrasil-go"]
path = libs/yggdrasil-go
url = https://github.com/yggdrasil-network/yggdrasil-go
url = https://github.com/aakselrod/yggdrasil-go
branch = mobile-listen

0 comments on commit d492dfe

Please sign in to comment.