Skip to content

Commit 35917ab

Browse files
authored
add Open_mSupply prefix to APK zip files (#7449)
1 parent b950840 commit 35917ab

File tree

1 file changed

+59
-60
lines changed

1 file changed

+59
-60
lines changed
+59-60
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
on:
2-
push:
3-
tags:
4-
- 'v*'
5-
workflow_dispatch:
2+
push:
3+
tags:
4+
- "v*"
5+
workflow_dispatch:
66

77
name: Android Build
88

@@ -11,67 +11,66 @@ jobs:
1111
runs-on: self-hosted
1212
timeout-minutes: 30
1313
steps:
14-
- uses: actions/checkout@v4
15-
with:
16-
fetch-depth: 0
14+
- uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
1717

18-
- name: Read .nvmrc
19-
run: echo "##[set-output name=NVMRC;]$(cat ./client/.nvmrc)"
20-
id: nvm
18+
- name: Read .nvmrc
19+
run: echo "##[set-output name=NVMRC;]$(cat ./client/.nvmrc)"
20+
id: nvm
2121

22-
- name: Use Node.js (.nvmrc)
23-
uses: actions/setup-node@v1
24-
with:
25-
node-version: "${{ steps.nvm.outputs.NVMRC }}"
22+
- name: Use Node.js (.nvmrc)
23+
uses: actions/setup-node@v1
24+
with:
25+
node-version: "${{ steps.nvm.outputs.NVMRC }}"
2626

27-
- name: Install deps
28-
uses: borales/actions-yarn@v4
29-
with:
30-
cmd: install
31-
dir: 'client'
32-
env:
33-
NODE_AUTH_TOKEN: ${{secrets.TOKEN_REPO}}
27+
- name: Install deps
28+
uses: borales/actions-yarn@v4
29+
with:
30+
cmd: install
31+
dir: "client"
32+
env:
33+
NODE_AUTH_TOKEN: ${{secrets.TOKEN_REPO}}
3434

35-
- name: Get Properties
36-
id: properties
37-
run: |
38-
cp "$HOME/android/local.properties" ./client/packages/android
39-
cp "$HOME/android/release.keystore" ./client/packages/android/app
35+
- name: Get Properties
36+
id: properties
37+
run: |
38+
cp "$HOME/android/local.properties" ./client/packages/android
39+
cp "$HOME/android/release.keystore" ./client/packages/android/app
4040
41-
- name: Set Up Rust
42-
uses: actions-rs/toolchain@v1
43-
with:
44-
toolchain: stable
45-
targets:
46-
aarch64-linux-android
47-
armv7-linux-androideabi
48-
# Targets need to match in the config.toml of the self-hosted machine
41+
- name: Set Up Rust
42+
uses: actions-rs/toolchain@v1
43+
with:
44+
toolchain: stable
45+
targets: aarch64-linux-android
46+
armv7-linux-androideabi
47+
# Targets need to match in the config.toml of the self-hosted machine
4948

50-
- name: Set Up Java
51-
uses: actions/setup-java@v4
52-
with:
53-
distribution: 'temurin'
54-
java-version: '17'
49+
- name: Set Up Java
50+
uses: actions/setup-java@v4
51+
with:
52+
distribution: "temurin"
53+
java-version: "17"
5554

56-
- name: Build Android App
57-
uses: borales/actions-yarn@v4
58-
with:
59-
cmd: android:build:release
60-
dir: 'client'
61-
env:
62-
NDK_BIN: /Users/tmfmacmini/android/ndk/27.2.12479018/toolchains/llvm/prebuilt/darwin-x86_64/bin/
63-
# Update this version when upgrading the NDK version on the self-hosted machine
64-
65-
- name: Upload Universal APK
66-
uses: actions/upload-artifact@v4
67-
with:
68-
name: Universal_Build
69-
path: ./client/packages/android/app/build/outputs/apk/universal/release/*.apk
70-
retention-days: 3
55+
- name: Build Android App
56+
uses: borales/actions-yarn@v4
57+
with:
58+
cmd: android:build:release
59+
dir: "client"
60+
env:
61+
NDK_BIN: /Users/tmfmacmini/android/ndk/27.2.12479018/toolchains/llvm/prebuilt/darwin-x86_64/bin/
62+
# Update this version when upgrading the NDK version on the self-hosted machine
7163

72-
- name: Upload Arm64 APK
73-
uses: actions/upload-artifact@v4
74-
with:
75-
name: Arm64_Build
76-
path: ./client/packages/android/app/build/outputs/apk/arm64/release/*.apk
77-
retention-days: 3
64+
- name: Upload Universal APK
65+
uses: actions/upload-artifact@v4
66+
with:
67+
name: Open_mSupply_Universal_Build
68+
path: ./client/packages/android/app/build/outputs/apk/universal/release/*.apk
69+
retention-days: 3
70+
71+
- name: Upload Arm64 APK
72+
uses: actions/upload-artifact@v4
73+
with:
74+
name: Open_mSupply_Arm64_Build
75+
path: ./client/packages/android/app/build/outputs/apk/arm64/release/*.apk
76+
retention-days: 3

0 commit comments

Comments
 (0)