Skip to content

Commit

Permalink
ci: update mac ci setup (#750)
Browse files Browse the repository at this point in the history
Description: move mac ci setup to use envoy's script. I don't see much of a point in keeping a separate script here. For instance, #10357 updated to fix bazel after CI images broke. Instead of keeping up-to-date we can piggy back on efforts in upstream Envoy. Obviously, if diverging needs evolve we might need a second script in Envoy Mobile that calls the Envoy script, and does additional work.
Risk Level: low, CI will let us know if I screwed up.
Testing: CI

Signed-off-by: Jose Nino <[email protected]>
Signed-off-by: JP Simard <[email protected]>
  • Loading branch information
junr03 authored and jpsim committed Nov 29, 2022
1 parent 4c8b3b0 commit 92a5078
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 42 deletions.
2 changes: 1 addition & 1 deletion mobile/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build --ios_simulator_version=13.3
build --spawn_strategy=local
build --verbose_failures
build --workspace_status_command=envoy/bazel/get_workspace_status
build --xcode_version=11.3
build --xcode_version=11.3.1
build --incompatible_bzl_disallow_load_after_statement=false
build --javabase=@bazel_tools//tools/jdk:jdk
build --define disable_known_issue_asserts=true
Expand Down
6 changes: 3 additions & 3 deletions mobile/.github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- run: ./ci/mac_ci_setup.sh
- run: ./envoy/ci/mac_ci_setup.sh
name: 'Install dependencies'
- name: 'Build envoy.aar distributable'
run: bazel build --fat_apk_cpu=x86 //:android_dist
Expand All @@ -58,7 +58,7 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- run: ./ci/mac_ci_setup.sh
- run: ./envoy/ci/mac_ci_setup.sh
name: 'Install dependencies'
- uses: actions/download-artifact@v1
with:
Expand All @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- run: ./ci/mac_ci_setup.sh
- run: ./envoy/ci/mac_ci_setup.sh
name: 'Install dependencies'
- uses: actions/download-artifact@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions mobile/.github/workflows/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
submodules: true
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- name: 'Build Envoy.framework distributable'
run: bazel build --config=release-ios --ios_multi_cpus=i386,x86_64,armv7,arm64 //:ios_dist
- name: 'Create temporary directory for artifact to produce properly named zip'
Expand All @@ -62,7 +62,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- uses: actions/download-artifact@v1
with:
name: envoy_ios_framework
Expand Down
2 changes: 1 addition & 1 deletion mobile/.github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
submodules: true
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- name: 'Run tests'
run: bazel test --test_output=all //test/common/...
tsan:
Expand Down
8 changes: 4 additions & 4 deletions mobile/.github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
submodules: true
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- name: 'Build Envoy.framework distributable'
run: bazel build --config=ios //:ios_dist
- name: 'Zip Envoy.framework.zip distributable'
Expand All @@ -36,7 +36,7 @@ jobs:
with:
submodules: true
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- uses: actions/download-artifact@v1
with:
name: Envoy.framework.zip
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
with:
submodules: true
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- uses: actions/download-artifact@v1
with:
name: Envoy.framework.zip
Expand All @@ -91,6 +91,6 @@ jobs:
with:
submodules: true
- name: 'Install dependencies'
run: ./ci/mac_ci_setup.sh
run: ./envoy/ci/mac_ci_setup.sh
- name: 'Run swift library tests'
run: bazel test --test_output=all --config=ios --build_tests_only //library/swift/test/...
30 changes: 0 additions & 30 deletions mobile/ci/mac_ci_setup.sh

This file was deleted.

2 changes: 1 addition & 1 deletion mobile/envoy
Submodule envoy updated from 609458 to d1a36f

0 comments on commit 92a5078

Please sign in to comment.