Skip to content

Commit 33b146e

Browse files
NikolaSimsicNikolaSimsic
committed
Update config
1 parent e5c884c commit 33b146e

5 files changed

Lines changed: 99 additions & 39 deletions

File tree

‎.github/actions/build-android/action.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ runs:
4242
run: npm run android:debug
4343
shell: bash
4444

45-
- name: Debug APK Output Directory
46-
run: |
47-
echo "Listing APK output directory:"
48-
ls -R ./android/app/build/outputs/apk/ || echo "Directory does not exist"
49-
shell: bash
50-
5145
- name: Copy Android APK to Shared Directory
5246
run: |
5347
mkdir -p ${{ github.workspace }}/artifacts/android-app

‎.github/actions/build-ios/action.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: 'Build iOS App'
2+
description: 'Build iOS app using Fastlane'
3+
4+
runs:
5+
using: 'composite'
6+
7+
steps:
8+
- name: Set up Ruby
9+
uses: ruby/setup-ruby@1a615958ad9d422dd932dc1d5823942ee002799f #v1
10+
with:
11+
ruby-version: '3.2'
12+
13+
- name: Install Fastlane
14+
run: gem install fastlane
15+
shell: bash
16+
17+
- name: Setup Node
18+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e #v4
19+
with:
20+
node-version-file: .nvmrc
21+
22+
- name: Run Fastlane
23+
run: cd ios && fastlane ios debug_internal
24+
shell: bash

‎.github/workflows/MiNe2e.yaml‎

Lines changed: 61 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,39 @@ jobs:
9696
name: mda
9797
path: automation.mda
9898

99-
android-app:
100-
runs-on: ubuntu-22.04
101-
steps:
102-
- name: "Check out code"
103-
uses: actions/checkout@v4
104-
- name: Build android apk
105-
uses: ./.github/actions/build-android
106-
with:
107-
google_services_json: ${{ secrets.GOOGLE_SERVICES_JSON }}
99+
# android-app:
100+
# runs-on: ubuntu-22.04
101+
# steps:
102+
# - name: "Check out code"
103+
# uses: actions/checkout@v4
104+
# - name: Build android apk
105+
# uses: ./.github/actions/build-android
106+
# with:
107+
# google_services_json: ${{ secrets.GOOGLE_SERVICES_JSON }}
108+
109+
# ios-app:
110+
# runs-on: macOS-13
111+
# steps:
112+
# - name: "Check out code"
113+
# uses: actions/checkout@v4
114+
# - name: Build ios app
115+
# uses: ./.github/actions/build-ios
116+
# env:
117+
# MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
118+
# MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
119+
# KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
120+
# GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
121+
# APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
122+
# APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
123+
# APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }}
124+
# - name: "Upload iOS App"
125+
# uses: actions/upload-artifact@v4
126+
# with:
127+
# name: ios-app
128+
# path: ios/build/Release-iphoneos/*.ipa
108129

109130
android-test:
110-
needs: [mendix-version, project, android-app]
131+
needs: [mendix-version, project]
111132
runs-on: ubuntu-22.04
112133
steps:
113134
- name: "Check out code"
@@ -116,17 +137,38 @@ jobs:
116137
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
117138
with:
118139
name: mda
119-
- name: "Download Android app"
120-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
121-
with:
122-
name: android-app
123-
path: android-app
140+
# - name: "Download Android app"
141+
# uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
142+
# with:
143+
# name: android-app
144+
# path: android-app
124145

125-
- name: "Debug Android app directory"
146+
- name: "Install GitHub CLI"
126147
run: |
127-
echo "Listing contents of android-app directory:"
128-
ls -R android-app/
129-
shell: bash
148+
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
149+
sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
150+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
151+
sudo apt update
152+
sudo apt install gh
153+
- name: "Authenticate GitHub CLI"
154+
run: |
155+
unset GITHUB_TOKEN
156+
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
157+
- name: "Fetch artifacts from run 676"
158+
id: fetch-artifacts
159+
run: |
160+
artifacts_url=$(gh api "repos/${{ github.repository }}/actions/runs/14200920117/artifacts" --jq '.artifacts[] | select(.name == "android-app") | .archive_download_url')
161+
echo "Artifacts URL: $artifacts_url"
162+
echo "artifacts_url=$artifacts_url" >> $GITHUB_ENV
163+
- name: "Download Android app"
164+
if: env.artifacts_url != ''
165+
run: |
166+
if [ -z "$artifacts_url" ]; then
167+
echo "No artifacts URL found."
168+
exit 1
169+
fi
170+
curl -L -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -o android-app.zip "$artifacts_url"
171+
unzip android-app.zip -d android-app
130172
131173
- name: "Check for APK file"
132174
run: |

‎ios/fastlane/Fastfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ platform :ios do
3535
)
3636
gym(scheme: "DeveloperApp", configuration: "ReleaseDevToolsEnabled", export_method: "development", build_path: "./builds/internal/intermediate", output_directory: "./builds/internal/output")
3737
end
38-
39-
desc "Builds and install DeveloperApp into the simulator"
40-
desc "This will use iPhone 13 Pro simulator with OS 15.5"
38+
39+
desc "Builds and installs DeveloperApp into the simulator for debugging"
4140
lane :debug_internal do
4241
UI.message("Installing dependencies")
43-
sh("npm", "i", "--legacy-peer-deps")
44-
cocoapods
45-
UI.message("Building and installing DeveloperApp")
42+
sh("npm", "ci", "--legacy-peer-deps") # Install npm dependencies
43+
cocoapods # Install CocoaPods dependencies
44+
45+
UI.message("Building DeveloperApp for Debug")
4646
gym(
47-
scheme: "DeveloperApp",
48-
configuration: "Debug",
49-
skip_package_ipa: true,
50-
skip_package_pkg: true,
51-
sdk: "iphonesimulator",
52-
destination: "platform=iOS Simulator,name=iPhone 13 Pro,OS=15.5",
53-
xcargs: "ONLY_ACTIVE_ARCH=NO",
47+
scheme: "DeveloperApp", # Replace with your app's scheme name
48+
configuration: "Debug", # Use Debug configuration
49+
skip_package_ipa: true, # Skip creating an .ipa file
50+
skip_package_pkg: true, # Skip creating a .pkg file
51+
sdk: "iphonesimulator", # Build for the iOS Simulator
52+
destination: "platform=iOS Simulator,name=iPhone 13 Pro,OS=15.5", # Target simulator
53+
xcargs: "ONLY_ACTIVE_ARCH=NO", # Ensure compatibility with all architectures
5454
)
5555
end
5656

‎maestro/tests/AppStartup.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ appId: "${APP_ID}"
1818
- takeScreenshot:
1919
path: "tests/images/actual/${PLATFORM}/MiN_page"
2020
- tapOn: "http://runtime-url:8080"
21-
- inputText: "http://10.0.2.2:8080"
21+
- inputText: "http://localhost:8080"
2222
- pressKey: Enter
2323
- tapOn: "Launch app"
2424
- extendedWaitUntil:

0 commit comments

Comments
 (0)