Skip to content

Commit 484b75f

Browse files
authored
Merge pull request #59464 from Expensify/Rory-RemoveRemainingSubmoduleUpdate
[No QA] Remove errant submodule updates
2 parents 843d8e3 + 7220bc6 commit 484b75f

File tree

4 files changed

+6
-53
lines changed

4 files changed

+6
-53
lines changed

.github/workflows/compareNDandODbuilds.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fi
3434
env:
3535
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
36+
3737
getOldDotBranchRef:
3838
runs-on: ubuntu-latest
3939
outputs:
@@ -50,17 +50,17 @@ jobs:
5050
fi
5151
env:
5252
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
53-
54-
53+
54+
5555
postGitHubCommentBuildStarted:
5656
name: Post build started comment
5757
uses: ./.github/workflows/postBuildStartedComment.yml
5858
secrets: inherit
59-
with:
59+
with:
6060
APP_PULL_REQUEST_NUMBER: ${{ inputs.PULL_REQUEST_NUMBER }}
6161
HYBRIDAPP_PULL_REQUEST_NUMBER: ${{ inputs.OLD_DOT_PULL_REQUEST_NUMBER }}
6262

63-
63+
6464
buildHybridAppAndroid:
6565
name: Build HybridApp Android
6666
needs: [getBranchRef, getOldDotBranchRef]
@@ -73,12 +73,7 @@ jobs:
7373
submodules: true
7474
ref: ${{ needs.getBranchRef.outputs.REF || 'main' }}
7575
token: ${{ secrets.OS_BOTIFY_TOKEN }}
76-
fetch-depth: 0
7776

78-
- name: Update submodule to match main
79-
run: |
80-
git submodule update --init --remote
81-
8277
- name: Checkout OldDot if PR specified
8378
if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
8479
run: |
@@ -178,7 +173,7 @@ jobs:
178173
uses: ./.github/actions/composite/setupNode
179174
with:
180175
IS_HYBRID_BUILD: 'false'
181-
176+
182177
- name: Install 1Password CLI
183178
# v1
184179
uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f

.github/workflows/deploy.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ jobs:
6868
with:
6969
submodules: true
7070
token: ${{ secrets.OS_BOTIFY_TOKEN }}
71-
# fetch-depth: 0 is required in order to fetch the correct submodule branch
72-
fetch-depth: 0
73-
74-
- name: Update submodule to match main
75-
run: |
76-
git submodule update --init --remote
7771

7872
- name: Configure MapBox SDK
7973
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
@@ -311,12 +305,6 @@ jobs:
311305
with:
312306
submodules: true
313307
token: ${{ secrets.OS_BOTIFY_TOKEN }}
314-
# fetch-depth: 0 is required in order to fetch the correct submodule branch
315-
fetch-depth: 0
316-
317-
- name: Update submodule
318-
run: |
319-
git submodule update --init --remote
320308

321309
- name: Configure MapBox SDK
322310
run: |

.github/workflows/testBuildHybrid.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,6 @@ jobs:
187187
submodules: true
188188
ref: ${{ needs.getNewDotRef.outputs.REF || 'main' }}
189189
token: ${{ secrets.OS_BOTIFY_TOKEN }}
190-
# fetch-depth: 0 is required in order to fetch the correct submodule branch
191-
fetch-depth: 0
192-
193-
- name: Update submodule to match main
194-
run: |
195-
git submodule update --init --remote
196-
if [[ -z "${{ needs.getOldDotRef.outputs.OLD_DOT_REF }}" ]]; then
197-
echo "Building from Mobile-Expensify main branch"
198-
fi
199190

200191
- name: Checkout Old Dot to author specified branch or commit
201192
if: ${{ needs.getOldDotRef.outputs.OLD_DOT_REF != '' }}
@@ -311,15 +302,6 @@ jobs:
311302
submodules: true
312303
ref: ${{ needs.getNewDotRef.outputs.REF || 'main'}}
313304
token: ${{ secrets.OS_BOTIFY_TOKEN }}
314-
# fetch-depth: 0 is required in order to fetch the correct submodule branch
315-
fetch-depth: 0
316-
317-
- name: Update submodule to match main
318-
run: |
319-
git submodule update --init --remote
320-
if [[ -z "${{ needs.getOldDotRef.outputs.OLD_DOT_REF }}" ]]; then
321-
echo "Building from Mobile-Expensify main branch"
322-
fi
323305

324306
- name: Checkout Old Dot to author specified branch or commit
325307
if: ${{ needs.getOldDotRef.outputs.OLD_DOT_REF != '' }}

.github/workflows/verifyHybridApp.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ jobs:
6969
ref: ${{ github.event.pull_request.head.sha }}
7070
token: ${{ secrets.OS_BOTIFY_TOKEN }}
7171

72-
- name: Update submodule to match main
73-
run: |
74-
git submodule update --init --remote --depth 1
75-
cd Mobile-Expensify
76-
git checkout main
77-
7872
- name: Configure MapBox SDK
7973
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
8074

@@ -112,12 +106,6 @@ jobs:
112106
ref: ${{ github.event.pull_request.head.sha }}
113107
token: ${{ secrets.OS_BOTIFY_TOKEN }}
114108

115-
- name: Update submodule to match main
116-
run: |
117-
git submodule update --init --remote --depth 1
118-
cd Mobile-Expensify
119-
git checkout main
120-
121109
- name: Configure MapBox SDK
122110
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
123111

0 commit comments

Comments
 (0)