Skip to content

Commit 596b675

Browse files
authored
Merge branch 'mx/11.12.x' into moo/MOO-2308-replace-notifee-library
2 parents 7bbb94f + ee8bcc6 commit 596b675

18 files changed

Lines changed: 139 additions & 201 deletions

File tree

.github/workflows/Build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: softprops/diffset@d60d53313c1b61c12ccb0fc76cbde5a14ae5d330 # v3
2424
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
2525
with:
26-
base: main
26+
base: mx/11.12.x
2727
global_files: |
2828
!{packages/**/*,configs/e2e/*.json,scripts/**/*,data/**/*}
2929
env:
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
fetch-depth: 0
35-
- name: "Fetching main to compare"
35+
- name: "Fetching base branch to compare"
3636
if: github.event_name == 'pull_request' && steps.files.outputs.global_files == ''
3737
run: git fetch --no-tags --prune --depth=1 origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
3838
- name: "Defining node version"
@@ -60,6 +60,6 @@ jobs:
6060
- name: "Building internal utilities"
6161
run: pnpm run build:internal-utils
6262
- name: "Running build for development"
63-
run: pnpm -r --filter='!native-widgets' --filter=$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '...[origin/main]'; else echo '**'; fi) run build
63+
run: pnpm -r --filter='!native-widgets' --filter=$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '...[origin/mx/11.12.x]'; else echo '**'; fi) run build
6464
env:
6565
NODE_OPTIONS: --max_old_space_size=8192

.github/workflows/Release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Run release
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [main, 'mx/11.12.x']
66
pull_request:
7-
branches: [main]
7+
branches: [main, 'mx/11.12.x']
88

99
jobs:
1010
test:
@@ -20,7 +20,7 @@ jobs:
2020
uses: softprops/diffset@d60d53313c1b61c12ccb0fc76cbde5a14ae5d330 # v3
2121
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
2222
with:
23-
base: main
23+
base: mx/11.12.x
2424
global_files: |
2525
!{packages/**/*,configs/e2e/*.json,scripts/**/*,data/**/*}
2626
env:
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030
with:
3131
fetch-depth: 0
32-
- name: "Fetching main to compare"
32+
- name: "Fetching base branch to compare"
3333
if: github.event_name == 'pull_request' && steps.files.outputs.global_files == ''
3434
run: git fetch --no-tags --prune --depth=1 origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
3535
- name: "Defining environment variables"
@@ -65,6 +65,6 @@ jobs:
6565
- name: "Building internal utilities"
6666
run: pnpm run build:internal-utils
6767
- name: "Running release for production"
68-
run: pnpm -r --filter=$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '...[origin/main]'; else echo '**'; fi) run release
68+
run: pnpm -r --filter=$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '...[origin/mx/11.12.x]'; else echo '**'; fi) run release
6969
env:
7070
NODE_OPTIONS: --max_old_space_size=8192

.github/workflows/ShaCheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: Ensure SHA pinned actions
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [main, 'mx/11.12.x']
66
paths:
77
- ".github/workflows/*.yml"
88
pull_request:
9-
branches: [main]
9+
branches: [main, 'mx/11.12.x']
1010
paths:
1111
- ".github/workflows/*.yml"
1212

.github/workflows/UnitTests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Run unit tests
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [main, 'mx/11.12.x']
66
pull_request:
7-
branches: [main]
7+
branches: [main, 'mx/11.12.x']
88

99
jobs:
1010
test:
@@ -17,7 +17,7 @@ jobs:
1717
uses: softprops/diffset@d60d53313c1b61c12ccb0fc76cbde5a14ae5d330 # v3
1818
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
1919
with:
20-
base: main
20+
base: mx/11.12.x
2121
global_files: |
2222
!{packages/**/*,configs/e2e/*.json,scripts/**/*,data/**/*}
2323
env:
@@ -26,12 +26,12 @@ jobs:
2626
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727
with:
2828
fetch-depth: 0
29-
- name: "Fetching main to compare"
29+
- name: "Fetching base branch to compare"
3030
if: github.event_name == 'pull_request' && steps.files.outputs.global_files == ''
3131
run: git fetch --no-tags --prune --depth=1 origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
3232
- name: "Defining environment variables"
3333
id: variables
34-
run: echo "arg=$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '...[origin/main]'; else echo '**'; fi)" >> ${{ runner.os == 'Windows' && '$env:GITHUB_OUTPUT' || '$GITHUB_OUTPUT' }}
34+
run: echo "arg=$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '...[origin/mx/11.12.x]'; else echo '**'; fi)" >> ${{ runner.os == 'Windows' && '$env:GITHUB_OUTPUT' || '$GITHUB_OUTPUT' }}
3535
- name: "Defining node version"
3636
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
3737
with:

packages/jsActions/mobile-resources-native/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1010

1111
- Replaced @notifee/react-native with react-native-notify-kit library.
1212

13+
## [12.2.1] Native Mobile Resources - 2026-7-17
1314
- We switched to a new sound library for the Play sound action to support react-native 0.84+.
1415
- The Play sound action now plays audio files from online (network) documents on Android by downloading them to a version-based cache before playback.
1516
- We have fixed the biometric authentication issue where it was not working on Android and crashing on iOS.
17+
- Fixed an issue where the `TakePicture` and `TakePictureAdvanced` actions failed to capture photos on Android.
18+
19+
## [3.1.2] Image
20+
### Fixed
21+
22+
- We fixed an issue that caused images from entities to not render on Android in Online Synchronization mode
1623

1724
## [12.2.0] Native Mobile Resources - 2026-7-3
1825

0 commit comments

Comments
 (0)