Skip to content

Commit 89a3bba

Browse files
NikolaSimsicNikolaSimsic
committed
Update config
1 parent 6dc2123 commit 89a3bba

3 files changed

Lines changed: 55 additions & 40 deletions

File tree

‎.github/workflows/MiNe2e.yaml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: "Debug Mendix Version"
3939
run: |
4040
echo "Mendix Version: ${{ steps.set-mendix-version.outputs.MENDIX_VERSION }}"
41-
41+
4242
docker-images:
4343
needs: mendix-version
4444
runs-on: ubuntu-22.04
@@ -68,32 +68,32 @@ jobs:
6868
tags: ghcr.io/mendix/make-it-native/mxbuild:${{ needs.mendix-version.outputs.mendix_version }}
6969

7070
project:
71-
needs: [docker-images, mendix-version]
72-
runs-on: ubuntu-22.04
73-
container:
74-
image: ghcr.io/mendix/make-it-native/mxbuild:${{ needs.mendix-version.outputs.mendix_version }}
75-
credentials:
76-
username: ${{ github.actor }}
77-
password: ${{ secrets.GITHUB_TOKEN }}
78-
steps:
79-
- name: "Make sure curl is installed"
80-
run: |
81-
apt update && apt upgrade -y
82-
apt install curl -y
83-
- name: "Download test project"
84-
run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/main.zip
85-
- name: "Extract test project"
86-
uses: montudor/action-zip@0852c26906e00f8a315c704958823928d8018b28 # v1.0.0
87-
with:
88-
args: unzip -qq project.zip -d .
89-
- name: "Force rebuild test project"
90-
run: |
91-
mxbuild -o automation.mda --loose-version-check Native-Mobile-Resources-main/NativeComponentsTestProject.mpr
92-
- name: "Upload MDA"
93-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
94-
with:
95-
name: mda
96-
path: automation.mda
71+
needs: [docker-images, mendix-version]
72+
runs-on: ubuntu-22.04
73+
container:
74+
image: ghcr.io/mendix/make-it-native/mxbuild:${{ needs.mendix-version.outputs.mendix_version }}
75+
credentials:
76+
username: ${{ github.actor }}
77+
password: ${{ secrets.GITHUB_TOKEN }}
78+
steps:
79+
- name: "Make sure curl is installed"
80+
run: |
81+
apt update && apt upgrade -y
82+
apt install curl -y
83+
- name: "Download test project"
84+
run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/main.zip
85+
- name: "Extract test project"
86+
uses: montudor/action-zip@0852c26906e00f8a315c704958823928d8018b28 # v1.0.0
87+
with:
88+
args: unzip -qq project.zip -d .
89+
- name: "Force rebuild test project"
90+
run: |
91+
mxbuild -o automation.mda --loose-version-check Native-Mobile-Resources-main/NativeComponentsTestProject.mpr
92+
- name: "Upload MDA"
93+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
94+
with:
95+
name: mda
96+
path: automation.mda
9797

9898
android-app:
9999
runs-on: ubuntu-22.04
@@ -124,6 +124,7 @@ jobs:
124124
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
125125
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
126126
APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }}
127+
MATCH_GIT_URL: https://gitlab.rnd.mendix.com/mobile-offline/ios-credentials-min-10.git
127128
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
128129
GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
129130
- name: "Upload iOS App"
@@ -133,6 +134,7 @@ jobs:
133134
path: ios/build/DeveloperApp-Debug.ipa
134135

135136
android-test:
137+
if: ${{ false }}
136138
needs: [mendix-version, project, android-app]
137139
runs-on: ubuntu-22.04
138140
steps:
@@ -174,7 +176,7 @@ jobs:
174176
# fi
175177
# curl -L -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -o android-app.zip "$artifacts_url"
176178
# unzip android-app.zip -d android-app
177-
179+
178180
- name: "Check for APK file"
179181
run: |
180182
echo "Checking for APK file..."
@@ -202,7 +204,7 @@ jobs:
202204
run: $HOME/.local/bin/maestro/bin/maestro --version
203205
- name: Set up Android SDK
204206
run: echo "ANDROID_HOME=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
205-
207+
206208
- name: Enable KVM
207209
run: |
208210
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -246,7 +248,6 @@ jobs:
246248
name: android-screenshots
247249
path: ${{ github.workspace }}/maestro/tests/images/actual/android/**/*.png
248250
if-no-files-found: warn
249-
250251

251252
# compare-screenshots:
252253
# needs: [android-test]
@@ -257,22 +258,21 @@ jobs:
257258
# steps:
258259
# - name: "Check out code"
259260
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
260-
261-
261+
262262
# - name: "Download all Android screenshots"
263263
# run: |
264264
# mkdir -p images/actual/android/
265265
# echo "Downloading all Android screenshots..."
266266
# gh run download ${{ github.run_id }} --name android-screenshots --dir images/actual/android/ || echo "⚠️ Failed to download Android screenshots."
267267
# ls -l images/actual/android/
268-
268+
269269
# - name: "Download all iOS screenshots"
270270
# run: |
271271
# mkdir -p images/actual/ios/
272272
# echo "Downloading all iOS screenshots..."
273273
# gh run download ${{ github.run_id }} --name ios-screenshots --dir images/actual/ios/ || echo "⚠️ Failed to download iOS screenshots."
274274
# ls -l images/actual/ios/
275-
275+
276276
# - name: "Set up node"
277277
# uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
278278
# with:
@@ -283,7 +283,7 @@ jobs:
283283
# run: npm install && npm install @actions/core pixelmatch
284284

285285
# - name: "Compare Android screenshots"
286-
# continue-on-error: true
286+
# continue-on-error: true
287287
# run: node ${{ github.workspace }}/maestro/helpers/compare_screenshots.js android
288288

289289
# - name: "Compare iOS screenshots"
@@ -296,7 +296,7 @@ jobs:
296296
# name: screenshot-diffs
297297
# path: maestro/tests/images/diffs/
298298
# if-no-files-found: ignore
299-
299+
300300
# - name: "Archive comparison results"
301301
# uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
302302
# with:
@@ -309,4 +309,4 @@ jobs:
309309
# if [ "$ANDROID_COMPARISON_FAILED" == "true" ] || [ "$IOS_COMPARISON_FAILED" == "true" ]; then
310310
# echo "One or more comparisons failed."
311311
# exit 1
312-
# fi
312+
# fi

‎ios/fastlane/Fastfile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,20 @@ platform :ios do
2929
disable_automatic_code_signing
3030

3131
UI.message("Get the certificates and profiles")
32+
auth_args = {}
33+
if ENV["MATCH_GIT_PRIVATE_KEY"] && !ENV["MATCH_GIT_PRIVATE_KEY"].empty?
34+
auth_args[:git_private_key] = ENV["MATCH_GIT_PRIVATE_KEY"]
35+
elsif ENV["MATCH_GIT_BASIC_AUTHORIZATION"] && !ENV["MATCH_GIT_BASIC_AUTHORIZATION"].empty?
36+
auth_args[:git_basic_authorization] = ENV["MATCH_GIT_BASIC_AUTHORIZATION"]
37+
end
3238
match(
3339
type:"appstore",
3440
api_key:api_key,
3541
keychain_name:keychain_name,
3642
keychain_password: ENV["KEYCHAIN_PASSWORD"],
37-
git_basic_authorization:ENV["MATCH_GIT_BASIC_AUTHORIZATION"],
43+
git_url: ENV["MATCH_GIT_URL"],
3844
readonly: false,
45+
**auth_args,
3946
)
4047

4148
UI.message("Set version number")
@@ -100,13 +107,20 @@ platform :ios do
100107
disable_automatic_code_signing
101108

102109
UI.message("Get the certificates and profiles")
110+
auth_args = {}
111+
if ENV["MATCH_GIT_PRIVATE_KEY"] && !ENV["MATCH_GIT_PRIVATE_KEY"].empty?
112+
auth_args[:git_private_key] = ENV["MATCH_GIT_PRIVATE_KEY"]
113+
elsif ENV["MATCH_GIT_BASIC_AUTHORIZATION"] && !ENV["MATCH_GIT_BASIC_AUTHORIZATION"].empty?
114+
auth_args[:git_basic_authorization] = ENV["MATCH_GIT_BASIC_AUTHORIZATION"]
115+
end
103116
match(
104117
type:"appstore",
105118
api_key:api_key,
106119
keychain_name:keychain_name,
107120
keychain_password: ENV["KEYCHAIN_PASSWORD"],
108-
git_basic_authorization:ENV["MATCH_GIT_BASIC_AUTHORIZATION"],
121+
git_url: ENV["MATCH_GIT_URL"],
109122
readonly: false,
123+
**auth_args,
110124
)
111125

112126
UI.message("Set version number")

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"ios:debug": "cd ios && arch -x86_64 fastlane debug_internal",
1616
"snyk": "npm run snyk:android && npm run snyk:ios",
1717
"snyk:ios": "cd ios && snyk monitor --org=appdev --project-name=developerapp-ios${SNYK_SUBPROJECT} --prune-repeated-subdependencies --debug",
18-
"snyk:android": "cd android && snyk monitor --gradle-sub-project=app --configuration-attributes='com.android.build.api.attributes.BuildTypeAttr:release,react-native-camera:general,org.jetbrains.kotlin.platform.type:androidJvm' --configuration-matching='compile|implementation' --org=appdev --project-name=developerapp-android${SNYK_SUBPROJECT}"
18+
"snyk:android": "cd android && snyk monitor --gradle-sub-project=app --configuration-attributes='com.android.build.api.attributes.BuildTypeAttr:release,react-native-camera:general,org.jetbrains.kotlin.platform.type:androidJvm' --configuration-matching='compile|implementation' --org=appdev --project-name=developerapp-android${SNYK_SUBPROJECT}",
19+
"run job": "gh workflow run MiNe2e.yaml --ref moo/MOO-1455-setup-MiN-test-job"
1920
},
2021
"dependencies": {
2122
"@mendix/native": "10.2.0",

0 commit comments

Comments
 (0)