Skip to content

Commit 128deb8

Browse files
lache-melvinlache-melvin
authored
Merge pull request #5167 from msupply-foundation/v2.3.0
V2.3.0
2 parents 3fd113d + 120b0ae commit 128deb8

File tree

652 files changed

+21408
-6209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

652 files changed

+21408
-6209
lines changed

‎.github/workflows/build-mac-demo.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
on:
1+
on:
22
workflow_dispatch:
33
inputs:
44
architecture:
@@ -24,6 +24,7 @@ jobs:
2424
build_and_test:
2525
name: Build mac demo
2626
runs-on: macos-latest
27+
timeout-minutes: 30
2728
steps:
2829
- uses: actions/checkout@v3
2930
- uses: actions-rs/toolchain@v1
@@ -49,4 +50,4 @@ jobs:
4950
- uses: actions/upload-artifact@v3
5051
with:
5152
name: ${{ env.artifactName }}
52-
path: ${{ env.zippedArtifactName }}
53+
path: ${{ env.zippedArtifactName }}

‎.github/workflows/client-bundle-size-diff.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
build-base:
1010
name: Build base
1111
runs-on: ubuntu-latest
12+
timeout-minutes: 20
1213
steps:
1314
- name: Checkout
1415
uses: actions/checkout@v2
@@ -42,6 +43,7 @@ jobs:
4243
build-pr:
4344
name: Build PR
4445
runs-on: ubuntu-latest
46+
timeout-minutes: 20
4547
steps:
4648
- name: Checkout
4749
uses: actions/checkout@v2
@@ -73,6 +75,7 @@ jobs:
7375
report:
7476
name: Generate report
7577
runs-on: ubuntu-latest
78+
timeout-minutes: 20
7679
needs: [build-base, build-pr]
7780

7881
steps:

‎.github/workflows/client-tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
test:
1111
name: Test
1212
runs-on: ubuntu-latest
13+
timeout-minutes: 20
1314
steps:
1415
- name: Checkout
1516
uses: actions/checkout@v2

‎.github/workflows/pr-issue-label-sync.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
jobs:
66
build:
77
runs-on: ubuntu-latest
8+
timeout-minutes: 5
89
steps:
910
- name: Sync labels
1011
uses: actions/github-script@v7

‎.github/workflows/server-build.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
build_and_test:
77
name: Remote Server Mac Build
88
runs-on: mac-latest
9+
timeout-minutes: 30
910
steps:
1011
- uses: actions/checkout@v2
1112
- uses: actions-rs/toolchain@v1

‎.github/workflows/server-tests.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
- main
55
- develop
66
paths:
7-
- "server/**"
7+
- 'server/**'
88
workflow_dispatch:
99

1010
name: CI
@@ -13,6 +13,7 @@ jobs:
1313
build_and_test:
1414
name: Remote Server Tests (sqlite)
1515
runs-on: ubuntu-latest
16+
timeout-minutes: 20
1617
steps:
1718
# --- install build dependencies taken from https://github.com/stbuehler/rust-async-dnssd/blob/master/.github/workflows/rust.yml
1819
- name: Update package list
@@ -26,6 +27,8 @@ jobs:
2627
- uses: Swatinem/rust-cache@v2
2728
with:
2829
workspaces: server
30+
- name: Free Disk Space (Ubuntu)
31+
uses: jlumbroso/[email protected]
2932
- uses: actions-rs/cargo@v1
3033
with:
3134
command: test

‎build/windows/installers-build.bat

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ start "" /wait "C:\Program Files (x86)\Setup Factory 9\SUFDesign.exe" /BUILD /LO
1515
start "" /wait "C:\Program Files (x86)\Setup Factory 9\SUFDesign.exe" /BUILD /LOG:installers\setup-factory.log "omSupply\omsupply_desktop.suf"
1616
start "" /wait "C:\Program Files (x86)\Setup Factory 9\SUFDesign.exe" /BUILD /LOG:installers\setup-factory.log "omSupply\omsupply_demo.suf"
1717
start "" /wait "C:\Program Files (x86)\Setup Factory 9\SUFDesign.exe" /BUILD /LOG:installers\setup-factory.log "omSupply\omsupply_standalone.suf"
18+
@REM copy omSupply\open-msupply-*.apk installers\Open_mSupply_Android_%versionTag%.apk

‎build/windows/omsupply-android.bat

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@ECHO ##### Building omSupply apk #####
2+
@REM copy the keystore and local.properties for apk signing
3+
copy c:\android\local.properties client\packages\android\ /y && copy c:\android\release.keystore client\packages\android\app\ /y
4+
cd "client" && yarn android:build:release && copy packages\android\app\build\outputs\apk\release\*.apk ..\omSupply
5+
@exit /b %errorlevel%

‎build/windows/omsupply-build.bat

+20-7
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@ xcopy "build\windows\*.*" "omSupply" /c
1313
xcopy "build\windows\demo" "omSupply\demo" /c /y /i
1414
copy "version.txt" "omSupply\version.txt"
1515

16-
start /wait /b build\windows\omsupply-prepare.bat
16+
@REM note: the /b must come first, otherwise the command is not waited
17+
start /b /wait build\windows\omsupply-prepare.bat
1718
@if %errorlevel% neq 0 exit /b %errorlevel%
1819

19-
@ECHO ##### Building omsupply for sqlite #####
20-
cd server && cargo build --release --bin omsupply_service && copy "target\release\omsupply_service.exe" "..\omSupply\Server\omSupply-sqlite.exe"
20+
@cd server
21+
22+
@ECHO ##### Building omsupply service::sqlite #####
23+
cargo build --release --bin omsupply_service && copy "target\release\omsupply_service.exe" "..\omSupply\Server\omSupply-sqlite.exe"
24+
@if %errorlevel% neq 0 exit /b %errorlevel%
25+
26+
@ECHO ##### Building sqlite omsupply server::sqlite #####
27+
cargo build --release && copy "target\release\remote_server.exe" "..\omSupply\Server\omSupply-server-sqlite.exe"
2128
@if %errorlevel% neq 0 exit /b %errorlevel%
2229

23-
@ECHO ##### Building omsupply for postgres #####
30+
@ECHO ##### Building omsupply service::postgres #####
2431
cargo build --release --bin omsupply_service --features postgres && copy "target\release\omsupply_service.exe" "..\omSupply\Server\omSupply-postgres.exe"
2532
@if %errorlevel% neq 0 exit /b %errorlevel%
2633

@@ -29,9 +36,15 @@ cargo build --release --bin remote_server_cli && copy "target\release\remote_ser
2936
cargo build --release --bin remote_server_cli --features postgres && copy "target\release\remote_server_cli.exe" "..\omSupply\Server\omSupply-cli-postgres.exe"
3037
@if %errorlevel% neq 0 exit /b %errorlevel%
3138

32-
@ECHO ##### Building omSupply for the desktop #####
33-
cd "..\client" && yarn electron:build && xcopy "packages\electron\out\open mSupply-win32-x64\**" "..\omSupply\Desktop\" /e /h /c /i
39+
@ECHO ##### Building connection test utility #####
40+
cargo build --release --bin test_connection && copy "target\release\test_connection.exe" "..\omSupply\Server\test-connection-sqlite.exe"
41+
cargo build --release --bin test_connection --features postgres && copy "target\release\test_connection.exe" "..\omSupply\Server\test-connection-postgres.exe"
3442
@if %errorlevel% neq 0 exit /b %errorlevel%
3543

36-
cd "..\server" && cargo build --release && copy "target\release\remote_server.exe" "..\omSupply\Server\omSupply-server-sqlite.exe"
44+
@cd..
45+
46+
@REM start /b /wait build\windows\omsupply-android.bat
47+
@REM @if %errorlevel% neq 0 exit /b %errorlevel%
48+
49+
start /b /wait build\windows\omsupply-electron.bat
3750
@if %errorlevel% neq 0 exit /b %errorlevel%

‎build/windows/omsupply-electron.bat

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@REM keep electron last, as it exits the batch when complete
2+
@ECHO ##### Building omSupply for the desktop #####
3+
cd "client" && yarn electron:build && xcopy "packages\electron\out\open mSupply-win32-x64\**" "..\omSupply\Desktop\" /e /h /c /i
4+
@exit /b %errorlevel%

‎build/windows/omsupply-prepare.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ECHO ##### Prepare omsupply build #####
1+
@ECHO ##### Prepare omsupply build #####
22
cd "client" && yarn install --force --frozen-lockfile && yarn build
3-
if %errorlevel% neq 0 exit /b %errorlevel%
3+
@exit /b %errorlevel%

‎build/windows/omsupply_desktop.suf

+1-1
Original file line numberDiff line numberDiff line change
@@ -3059,7 +3059,7 @@ g_HandleSystemReboot();
30593059
<ProjFileEmail/>
30603060
<ProjFileCreatedVer>9.5.1.0</ProjFileCreatedVer>
30613061
<ProjFileSavedVer>9.5.3.0</ProjFileSavedVer>
3062-
<BaseFolderArchive>C:\Program Files (x86)\Jenkins\jobs\omSupplyMain - Installers\workspace\omSupply\omSupply Desktop Server</BaseFolderArchive>
3062+
<BaseFolderArchive>#PROJECTFILEDIR#\omSupply\omSupply Desktop Server</BaseFolderArchive>
30633063
<BaseFolderExternal/>
30643064
<UseSkinFile>0</UseSkinFile>
30653065
<SkinFilename/>

0 commit comments

Comments
 (0)