Skip to content

[No QA] Remove errant submodule updates #59464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions .github/workflows/compareNDandODbuilds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

getOldDotBranchRef:
runs-on: ubuntu-latest
outputs:
Expand All @@ -50,17 +50,17 @@ jobs:
fi
env:
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}


postGitHubCommentBuildStarted:
name: Post build started comment
uses: ./.github/workflows/postBuildStartedComment.yml
secrets: inherit
with:
with:
APP_PULL_REQUEST_NUMBER: ${{ inputs.PULL_REQUEST_NUMBER }}
HYBRIDAPP_PULL_REQUEST_NUMBER: ${{ inputs.OLD_DOT_PULL_REQUEST_NUMBER }}


buildHybridAppAndroid:
name: Build HybridApp Android
needs: [getBranchRef, getOldDotBranchRef]
Expand All @@ -73,12 +73,7 @@ jobs:
submodules: true
ref: ${{ needs.getBranchRef.outputs.REF || 'main' }}
token: ${{ secrets.OS_BOTIFY_TOKEN }}
fetch-depth: 0

- name: Update submodule to match main
run: |
git submodule update --init --remote

- name: Checkout OldDot if PR specified
if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
run: |
Expand Down Expand Up @@ -178,7 +173,7 @@ jobs:
uses: ./.github/actions/composite/setupNode
with:
IS_HYBRID_BUILD: 'false'

- name: Install 1Password CLI
# v1
uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ jobs:
with:
submodules: true
token: ${{ secrets.OS_BOTIFY_TOKEN }}
# fetch-depth: 0 is required in order to fetch the correct submodule branch
fetch-depth: 0

- name: Update submodule to match main
run: |
git submodule update --init --remote

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
Expand Down Expand Up @@ -311,12 +305,6 @@ jobs:
with:
submodules: true
token: ${{ secrets.OS_BOTIFY_TOKEN }}
# fetch-depth: 0 is required in order to fetch the correct submodule branch
fetch-depth: 0

- name: Update submodule
run: |
git submodule update --init --remote

- name: Configure MapBox SDK
run: |
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/testBuildHybrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,6 @@ jobs:
submodules: true
ref: ${{ needs.getNewDotRef.outputs.REF || 'main' }}
token: ${{ secrets.OS_BOTIFY_TOKEN }}
# fetch-depth: 0 is required in order to fetch the correct submodule branch
fetch-depth: 0

- name: Update submodule to match main
run: |
git submodule update --init --remote
if [[ -z "${{ needs.getOldDotRef.outputs.OLD_DOT_REF }}" ]]; then
echo "Building from Mobile-Expensify main branch"
fi

- name: Checkout Old Dot to author specified branch or commit
if: ${{ needs.getOldDotRef.outputs.OLD_DOT_REF != '' }}
Expand Down Expand Up @@ -311,15 +302,6 @@ jobs:
submodules: true
ref: ${{ needs.getNewDotRef.outputs.REF || 'main'}}
token: ${{ secrets.OS_BOTIFY_TOKEN }}
# fetch-depth: 0 is required in order to fetch the correct submodule branch
fetch-depth: 0

- name: Update submodule to match main
run: |
git submodule update --init --remote
if [[ -z "${{ needs.getOldDotRef.outputs.OLD_DOT_REF }}" ]]; then
echo "Building from Mobile-Expensify main branch"
fi

- name: Checkout Old Dot to author specified branch or commit
if: ${{ needs.getOldDotRef.outputs.OLD_DOT_REF != '' }}
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/verifyHybridApp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
token: ${{ secrets.OS_BOTIFY_TOKEN }}

- name: Update submodule to match main
run: |
git submodule update --init --remote --depth 1
cd Mobile-Expensify
git checkout main

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

Expand Down Expand Up @@ -112,12 +106,6 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
token: ${{ secrets.OS_BOTIFY_TOKEN }}

- name: Update submodule to match main
run: |
git submodule update --init --remote --depth 1
cd Mobile-Expensify
git checkout main

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

Expand Down
Loading