Skip to content

Commit

Permalink
Revert "Revert "ci: revert EngFlow ios_build changes (#1700)" (#1704)" (
Browse files Browse the repository at this point in the history
#1711)

Description: This reverts commit b04a8ab1adaa17a6cc8f574bca18b926a371f537.

The RBE ios_build job has been timing out every time in CI, and switching back to running on GHA runners resolves the issue.

Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
  • Loading branch information
goaway authored and jpsim committed Nov 29, 2022
1 parent d5b580a commit 2ced6c1
Showing 1 changed file with 27 additions and 12 deletions.
39 changes: 27 additions & 12 deletions mobile/.github/workflows/ios_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,29 @@ jobs:
- run: ./ci/mac_ci_setup.sh
if: steps.check-cache.outputs.cache-hit != 'true'
name: 'Install dependencies'
- run: bazelisk build --config=ios //:ios_dist
if: steps.check-cache.outputs.cache-hit != 'true'
name: 'Build Envoy.framework distributable'
iosbuildshadow:
name: ios_build_shadow
runs-on: macOS-latest
timeout-minutes: 75
steps:
- uses: actions/checkout@v1
with:
submodules: true
- uses: actions/cache@v2
id: check-cache
with:
key: framework-shadow-${{ github.sha }}
path: dist/Envoy.framework
name: 'Check cache'
- run: echo "Found Envoy.framework from previous run!"
if: steps.check-cache.outputs.cache-hit == 'true'
name: 'Build cache hit'
- run: ./ci/mac_ci_setup.sh
if: steps.check-cache.outputs.cache-hit != 'true'
name: 'Install dependencies'
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand Down Expand Up @@ -54,14 +77,10 @@ jobs:
- run: exit 1
if: steps.check-cache.outputs.cache-hit != 'true'
name: 'Short-circuit'
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: bazelisk build --config=ios --config=remote-ci-macos --remote_header="Authorization=Bearer $GITHUB_TOKEN" //examples/swift/hello_world:app
- run: bazelisk build --config=ios //examples/swift/hello_world:app
name: 'Build swift app'
# Run the app in the background and redirect logs.
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: bazelisk run --config=ios --config=remote-ci-macos --remote_header="Authorization=Bearer $GITHUB_TOKEN" //examples/swift/hello_world:app &> /tmp/envoy.log &
- run: bazelisk run --config=ios //examples/swift/hello_world:app &> /tmp/envoy.log &
name: 'Run swift app'
- run: sed '/received headers with status 200/q' <(touch /tmp/envoy.log && tail -F /tmp/envoy.log)
name: 'Check connectivity'
Expand All @@ -88,14 +107,10 @@ jobs:
- run: exit 1
if: steps.check-cache.outputs.cache-hit != 'true'
name: 'Short-circuit'
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: bazelisk build --config=ios --config=remote-ci-macos --remote_header="Authorization=Bearer $GITHUB_TOKEN" //examples/objective-c/hello_world:app
- run: bazelisk build --config=ios //examples/objective-c/hello_world:app
name: 'Build objective-c app'
# Run the app in the background and redirect logs.
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: bazelisk run --config=ios --config=remote-ci-macos --remote_header="Authorization=Bearer $GITHUB_TOKEN" //examples/objective-c/hello_world:app &> /tmp/envoy.log &
- run: bazelisk run --config=ios //examples/objective-c/hello_world:app &> /tmp/envoy.log &
name: 'Run objective-c app'
- run: sed '/received headers with status 200/q' <(touch /tmp/envoy.log && tail -F /tmp/envoy.log)
name: 'Check connectivity'
Expand Down

0 comments on commit 2ced6c1

Please sign in to comment.