Skip to content

Commit 6fb109f

Browse files
author
Rahim Rahman
authored
fix(): update INTUNE_ENABLED within Github CI & Podfile (#9453)
* fix(): update INTUNE_ENABLED within Github CI & Podfile * temporary switch to iOS 15 and false INTUNE_ENABLED * revert INTUNE_ENABLED='false' and iOS 15
1 parent cbf300f commit 6fb109f

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ runs:
5252
- name: ci/install-pods-dependencies
5353
shell: bash
5454
env:
55-
INTUNE_ENABLED: ${{ inputs.intune-enabled == 'true' && '1' || '0' }}
55+
INTUNE_ENABLED: ${{ inputs.intune-enabled }}
5656
run: |
5757
echo "::group::install-pods-dependencies"
5858
echo "INTUNE_ENABLED=$INTUNE_ENABLED"

‎.github/workflows/build-ios-beta.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
env:
1212
NODE_VERSION: 22.14.0
1313
TERM: xterm
14-
INTUNE_ENABLED: 1
14+
INTUNE_ENABLED: 'true'
1515

1616
jobs:
1717
test:
@@ -34,7 +34,7 @@ jobs:
3434
- name: ci/prepare-ios-build
3535
uses: ./.github/actions/prepare-ios-build
3636
with:
37-
intune-enabled: 'true'
37+
intune-enabled: ${{ env.INTUNE_ENABLED }}
3838
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
3939

4040
- name: ci/build-ios-simulator
@@ -70,7 +70,7 @@ jobs:
7070
- name: ci/prepare-ios-build
7171
uses: ./.github/actions/prepare-ios-build
7272
with:
73-
intune-enabled: 'true'
73+
intune-enabled: ${{ env.INTUNE_ENABLED }}
7474
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
7575

7676
- name: ci/build-and-deploy-ios-beta

‎.github/workflows/build-ios-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
env:
1212
NODE_VERSION: 22.14.0
1313
TERM: xterm
14-
INTUNE_ENABLED: 1
14+
INTUNE_ENABLED: 'true'
1515

1616
jobs:
1717
test:
@@ -39,7 +39,7 @@ jobs:
3939
- name: ci/prepare-ios-build
4040
uses: ./.github/actions/prepare-ios-build
4141
with:
42-
intune-enabled: 'true'
42+
intune-enabled: ${{ env.INTUNE_ENABLED }}
4343
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
4444

4545
- name: ci/build-and-deploy-ios-release
@@ -82,7 +82,7 @@ jobs:
8282
- name: ci/prepare-ios-build
8383
uses: ./.github/actions/prepare-ios-build
8484
with:
85-
intune-enabled: 'true'
85+
intune-enabled: ${{ env.INTUNE_ENABLED }}
8686
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
8787

8888
- name: ci/build-ios-simulator

‎.github/workflows/build-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
env:
99
NODE_VERSION: 22.14.0
1010
TERM: xterm
11-
INTUNE_ENABLED: 1
11+
INTUNE_ENABLED: 'true'
1212

1313
jobs:
1414
test:
@@ -41,7 +41,7 @@ jobs:
4141
- name: ci/prepare-ios-build
4242
uses: ./.github/actions/prepare-ios-build
4343
with:
44-
intune-enabled: 'true'
44+
intune-enabled: ${{ env.INTUNE_ENABLED }}
4545
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
4646

4747
- name: ci/build-ios-pr

‎.github/workflows/e2e-detox-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
INTUNE_ENABLED: 1
18+
INTUNE_ENABLED: 'true'
1919

2020
jobs:
2121
update-initial-status-ios:
@@ -59,7 +59,7 @@ jobs:
5959
- name: Prepare iOS Build
6060
uses: ./.github/actions/prepare-ios-build
6161
with:
62-
intune-enabled: 'true'
62+
intune-enabled: ${{ env.INTUNE_ENABLED }}
6363
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
6464

6565
- name: Build iOS Simulator

‎.github/workflows/e2e-detox-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- release-*
77

88
env:
9-
INTUNE_ENABLED: 1
9+
INTUNE_ENABLED: 'true'
1010

1111
jobs:
1212
update-initial-status-ios:
@@ -46,7 +46,7 @@ jobs:
4646
- name: Prepare iOS Build
4747
uses: ./.github/actions/prepare-ios-build
4848
with:
49-
intune-enabled: 'true'
49+
intune-enabled: ${{ env.INTUNE_ENABLED }}
5050
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
5151

5252
- name: Build iOS Simulator

‎.github/workflows/e2e-detox-scheduled.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- cron: "0 0 * * 4,5" # Wednesday and Thursday midnight
66

77
env:
8-
INTUNE_ENABLED: 1
8+
INTUNE_ENABLED: 'true'
99

1010
jobs:
1111
update-initial-status-ios:
@@ -45,7 +45,7 @@ jobs:
4545
- name: Prepare iOS Build
4646
uses: ./.github/actions/prepare-ios-build
4747
with:
48-
intune-enabled: 'true'
48+
intune-enabled: ${{ env.INTUNE_ENABLED }}
4949
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
5050

5151
- name: Build iOS Simulator

‎.github/workflows/github-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
RELEASE_TAG: ${{ inputs.tag || github.ref_name }}
1616
SNYK_VERSION: "1.1297.2"
1717
CYCLONEDX_VERSION: "v0.27.2"
18-
INTUNE_ENABLED: 1
18+
INTUNE_ENABLED: 'true'
1919

2020
jobs:
2121
test:
@@ -42,7 +42,7 @@ jobs:
4242
- name: ci/prepare-ios-build
4343
uses: ./.github/actions/prepare-ios-build
4444
with:
45-
intune-enabled: 'true'
45+
intune-enabled: ${{ env.INTUNE_ENABLED }}
4646
intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
4747

4848
- name: ci/build-ios-unsigned

‎ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ setup_permissions([
2626
])
2727

2828
# Conditional Intune MAM support
29-
intune_enabled = ENV['INTUNE_ENABLED'] == '1'
29+
intune_enabled = ENV['INTUNE_ENABLED'] == 'true' || ENV['INTUNE_ENABLED'] == '1'
3030

3131
if intune_enabled
3232
puts "🔐 Intune MAM features enabled"

0 commit comments

Comments
 (0)