Skip to content

Commit d50dbb1

Browse files
NikolaSimsicNikolaSimsic
committed
Resolve review findings
1 parent 6055c0c commit d50dbb1

File tree

11 files changed

+46
-84
lines changed

11 files changed

+46
-84
lines changed

‎.github/actions/start-runtime/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
shell: bash
2020
- name: "Setup Java 21"
2121
id: setup-java
22-
uses: actions/setup-java@v4
22+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 #v4
2323
with:
2424
distribution: "temurin"
2525
java-version: "21"

‎.github/workflows/NativeAutomatedTestsAndroid.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
# - name: "Checking changed files"
2222
# id: files
23-
# uses: softprops/diffset@v1
23+
# uses: softprops/diffset@d5947696689a571f7a984a52505e2649eead5c22 # v1
2424
# if:
2525
# github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name ==
2626
# github.repository

‎.github/workflows/NativePipeline.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
widgets: ${{ steps.scope.outputs.widgets }}
7575
steps:
7676
- name: "Check out code"
77-
uses: actions/checkout@v4
77+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
7878

7979
- name: "Determine scope"
8080
id: scope
@@ -121,7 +121,7 @@ jobs:
121121
mendix_version: ${{ steps.set-mendix-version.outputs.MENDIX_VERSION }}
122122
steps:
123123
- name: "Check out code"
124-
uses: actions/checkout@v4
124+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
125125
- name: "Get Mendix version from JSON"
126126
id: get-mendix-version
127127
uses: notiz-dev/github-action-json-property@7a701887f4b568b23eb7b78bb0fc49aaeb1b68d3 # v0.2.0
@@ -155,7 +155,7 @@ jobs:
155155
docker manifest inspect ghcr.io/mendix/native-widgets/mxbuild:${{ needs.mendix-version.outputs.mendix_version }} || EXIT_CODE=$?
156156
echo "IMAGE_MISSING=$EXIT_CODE" >> $GITHUB_ENV
157157
- name: "Check out code"
158-
uses: actions/checkout@v4
158+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
159159
if: ${{ env.IMAGE_MISSING != 0 }}
160160
- name: "Build mxbuild image"
161161
if: ${{ env.IMAGE_MISSING != 0 }}
@@ -175,11 +175,11 @@ jobs:
175175
contents: read
176176
steps:
177177
- name: "Check out code"
178-
uses: actions/checkout@v4
178+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
179179
with:
180180
fetch-depth: 0
181181
- name: "Set up node"
182-
uses: actions/setup-node@v4
182+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
183183
with:
184184
node-version-file: .nvmrc
185185
cache: yarn
@@ -195,7 +195,7 @@ jobs:
195195
env:
196196
NODE_OPTIONS: --max_old_space_size=6144
197197
- name: "Upload resources artifact"
198-
uses: actions/upload-artifact@v4
198+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
199199
with:
200200
name: resources
201201
path: |
@@ -254,7 +254,7 @@ jobs:
254254
run: |
255255
mxbuild -o automation.mda --loose-version-check Native-Mobile-Resources-main/NativeComponentsTestProject.mpr
256256
- name: "Upload MDA"
257-
uses: actions/upload-artifact@v4
257+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
258258
with:
259259
name: mda
260260
path: automation.mda
@@ -268,7 +268,7 @@ jobs:
268268
password: ${{ secrets.GITHUB_TOKEN }}
269269
steps:
270270
- name: "Check out code"
271-
uses: actions/checkout@v4
271+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
272272
- name: "Download deployment package"
273273
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
274274
with:
@@ -288,7 +288,7 @@ jobs:
288288
password: ${{ secrets.GITHUB_TOKEN }}
289289
steps:
290290
- name: "Check out code"
291-
uses: actions/checkout@v4
291+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
292292
- name: "Download project MDA file"
293293
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
294294
with:
@@ -303,13 +303,13 @@ jobs:
303303
runs-on: ubuntu-22.04
304304
steps:
305305
- name: "Check out Native Template for Native Components Test Project"
306-
uses: actions/checkout@v4
306+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
307307
with:
308308
repository: mendix/native-template
309309
ref: ${{ github.event.inputs.nt_branch || 'master' }}
310310
path: native-template
311311
- name: "Check out code"
312-
uses: actions/checkout@v4
312+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
313313
with:
314314
path: native-widgets
315315
- name: "Download Android bundle and assets"
@@ -318,13 +318,13 @@ jobs:
318318
name: android-bundle
319319
path: bundles/android
320320
- name: "Set up Node"
321-
uses: actions/setup-node@v4
321+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
322322
with:
323323
node-version-file: native-template/.nvmrc
324324
cache: npm
325325
cache-dependency-path: native-template/package-lock.json
326326
- name: "Cache Android Build"
327-
uses: actions/cache@v3
327+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
328328
with:
329329
path: native-template/android/app/build
330330
key: ${{ runner.os }}-android-build-${{ hashFiles('native-template/android/app/src/**/*.java', 'native-template/android/app/src/**/*.kt', 'native-template/android/app/build.gradle') }}
@@ -341,7 +341,7 @@ jobs:
341341
working-directory: native-template
342342
run: npm i
343343
- name: "Setup JDK "
344-
uses: actions/setup-java@v4
344+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 #v4
345345
with:
346346
java-version: 21
347347
distribution: temurin
@@ -360,7 +360,7 @@ jobs:
360360
echo "Listing APK files in the output directory:"
361361
ls -R native-template/android/app/build/outputs/apk/
362362
- name: "Archive Android app"
363-
uses: actions/upload-artifact@v4
363+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
364364
with:
365365
name: android-app
366366
path: native-template/android/app/build/outputs/apk/**/*.apk
@@ -369,13 +369,13 @@ jobs:
369369
runs-on: macos-13
370370
steps:
371371
- name: "Check out Native Template for Native Components Test Project"
372-
uses: actions/checkout@v4
372+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
373373
with:
374374
repository: mendix/native-template
375375
ref: ${{ github.event.inputs.nt_branch || 'master' }}
376376
path: native-template
377377
- name: "Check out code"
378-
uses: actions/checkout@v4
378+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
379379
with:
380380
path: native-widgets
381381
- name: "Download iOS bundle and assets"
@@ -384,13 +384,13 @@ jobs:
384384
name: ios-bundle
385385
path: bundles/ios
386386
- name: "Set up Node"
387-
uses: actions/setup-node@v4
387+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
388388
with:
389389
node-version-file: native-template/.nvmrc
390390
cache: npm
391391
cache-dependency-path: native-template/package-lock.json
392392
- name: "Cache iOS Build"
393-
uses: actions/cache@v3
393+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
394394
with:
395395
path: native-template/ios/build
396396
key: ${{ runner.os }}-ios-build-${{ hashFiles('native-template/ios/**/*.swift', 'native-template/ios/**/*.h', 'native-template/ios/Podfile.lock') }}
@@ -407,7 +407,7 @@ jobs:
407407
run: npm i
408408

409409
- name: "Setup Pods cache"
410-
uses: actions/cache@v3
410+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
411411
with:
412412
path: native-template/Pods
413413
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
@@ -420,7 +420,7 @@ jobs:
420420
working-directory: native-template/ios
421421
run: xcodebuild -workspace NativeTemplate.xcworkspace -scheme nativeTemplate -configuration Debug -sdk iphonesimulator -derivedDataPath build ONLY_ACTIVE_ARCH=YES VALID_ARCHS="i386 x86_64"
422422
- name: "Archive iOS app"
423-
uses: actions/upload-artifact@v4
423+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
424424
with:
425425
name: ios-app
426426
path: native-template/ios/build/Build/Products/**/*.app
@@ -434,18 +434,18 @@ jobs:
434434
fail-fast: false
435435
steps:
436436
- name: "Check out code"
437-
uses: actions/checkout@v4
437+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
438438
with:
439439
fetch-depth: 0
440440
- name: "Set up node"
441-
uses: actions/setup-node@v4
441+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
442442
with:
443443
node-version-file: .nvmrc
444444
cache: yarn
445445
- name: "Install dependencies"
446446
run: yarn install --immutable
447447
- name: "Download project MDA file"
448-
uses: actions/download-artifact@v4
448+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
449449
with:
450450
name: mda
451451

@@ -478,7 +478,7 @@ jobs:
478478
# unzip android-app.zip -d android-app
479479

480480
- name: "Download Android app"
481-
uses: actions/download-artifact@v4
481+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
482482
with:
483483
name: android-app
484484
path: android-app
@@ -507,7 +507,7 @@ jobs:
507507
sudo udevadm control --reload-rules
508508
sudo udevadm trigger --name-match=kvm
509509
- name: "Run the android tests"
510-
uses: reactivecircus/android-emulator-runner@v2.32.0
510+
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.0.0
511511
with:
512512
api-level: 30
513513
target: google_apis
@@ -522,21 +522,21 @@ jobs:
522522
bash maestro/run_maestro_tests.sh android "${{ matrix.widget }}"
523523
524524
- name: "Archive runtime logs"
525-
uses: actions/upload-artifact@v4
525+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
526526
if: always()
527527
with:
528528
name: android-runtime-logs-${{ matrix.widget }}
529529
path: log/*.log
530530
if-no-files-found: ignore
531531
- name: "Archive test screenshots"
532-
uses: actions/upload-artifact@v4
532+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
533533
if: always()
534534
with:
535535
name: android-screenshots-${{ matrix.widget }}
536536
path: ${{ github.workspace }}/maestro/images/actual/android/**/*.png
537537
if-no-files-found: ignore
538538
- name: "Archive artifacts"
539-
uses: actions/upload-artifact@v4
539+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
540540
if: always()
541541
with:
542542
name: android-artifacts-${{ matrix.widget }}
@@ -552,11 +552,11 @@ jobs:
552552
fail-fast: false
553553
steps:
554554
- name: "Check out code"
555-
uses: actions/checkout@v4
555+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
556556
with:
557557
fetch-depth: 0
558558
- name: "Set up node"
559-
uses: actions/setup-node@v4
559+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
560560
with:
561561
node-version-file: .nvmrc
562562
cache: yarn
@@ -565,7 +565,7 @@ jobs:
565565
yarn cache clean
566566
yarn install --immutable
567567
- name: "Download project MDA file"
568-
uses: actions/download-artifact@v4
568+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
569569
with:
570570
name: mda
571571

@@ -637,21 +637,21 @@ jobs:
637637
bash maestro/run_maestro_tests.sh ios "${{ matrix.widget }}"
638638
639639
- name: "Archive runtime logs"
640-
uses: actions/upload-artifact@v4
640+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
641641
if: always()
642642
with:
643643
name: ios-runtime-logs-${{ matrix.widget }}
644644
path: log/*.log
645645
if-no-files-found: ignore
646646
- name: "Archive test screenshots"
647-
uses: actions/upload-artifact@v4
647+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
648648
if: always()
649649
with:
650650
name: ios-screenshots-${{ matrix.widget }}
651651
path: ${{ github.workspace }}/maestro/images/actual/ios/**/*.png
652652
if-no-files-found: ignore
653653
- name: "Archive artifacts"
654-
uses: actions/upload-artifact@v4
654+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
655655
if: always()
656656
with:
657657
name: ios-artifacts-${{ matrix.widget }}
@@ -666,7 +666,7 @@ jobs:
666666
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
667667
steps:
668668
- name: "Check out code"
669-
uses: actions/checkout@v4
669+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
670670

671671
- name: "Download Android screenshots"
672672
run: |
@@ -688,7 +688,7 @@ jobs:
688688
689689
690690
- name: "Set up node"
691-
uses: actions/setup-node@v4
691+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
692692
with:
693693
node-version-file: .nvmrc
694694
cache: yarn
@@ -705,14 +705,14 @@ jobs:
705705
run: node ${{ github.workspace }}/maestro/helpers/compare_screenshots.js ios
706706

707707
- name: "Archive diff results"
708-
uses: actions/upload-artifact@v4
708+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
709709
with:
710710
name: screenshot-diffs
711711
path: images/diffs
712712
if-no-files-found: ignore
713713

714714
- name: "Archive comparison results"
715-
uses: actions/upload-artifact@v4
715+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
716716
with:
717717
name: comparison-results
718718
path: compare_output.txt

‎maestro/helpers/prepare_ios.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,28 @@
11
#!/bin/bash
22

3-
# Function to start the iOS simulator
43
start_simulator() {
54
echo "Starting iOS Simulator..."
65
xcrun simctl boot "iPhone 16" || echo "Simulator already booted"
76
sleep 30
87
xcrun simctl bootstatus || echo "Simulator booted successfully"
98
}
109

11-
# Function to set the status bar on the iOS simulator
1210
set_status_bar() {
1311
echo "Setting status bar on iOS Simulator..."
1412
xcrun simctl status_bar "iPhone 16" override --time "11:01" --wifiBars 3 --cellularBars 4 --batteryState charged --batteryLevel 100
1513
}
1614

17-
# Function to install the iOS app on the simulator
1815
install_ios_app() {
1916
echo "Installing iOS app on simulator..."
2017
xcrun simctl install booted ios-app/Debug-iphonesimulator/NativeTemplate.app
2118
}
2219

23-
# Function to verify the installed app
2420
verify_installed_app() {
2521
echo "Verifying installed app..."
2622
xcrun simctl get_app_container booted com.mendix.native.template
2723
}
2824

29-
# Function to launch the iOS app
30-
# launch_ios_app() {
31-
# echo "Launching iOS app..."
32-
# xcrun simctl launch booted com.mendix.native.template
33-
# }
34-
35-
# Prepare the iOS simulator and install the app
3625
start_simulator
3726
set_status_bar
3827
install_ios_app
39-
verify_installed_app
40-
# launch_ios_app
28+
verify_installed_app

‎maestro/images/expected/android/line_chart.png

97.5 KB
Loading

‎maestro/images/expected/ios/line_chart.png

150 KB
Loading

‎packages/pluggableWidgets/activity-indicator-native/e2e/specs/maestro/ActivityIndicator.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,3 @@ appId: "${APP_ID}"
77
text: "Activity indicator"
88
- assertVisible:
99
text: "Default"
10-
# - assertVisible:
11-
# id: "activityIndicatorDefault"
12-
# - takeScreenshot:
13-
# path: "maestro/images/actual/${PLATFORM}/activity_indicator"

0 commit comments

Comments
 (0)