Skip to content

Commit

Permalink
mac/ci: Shift to github (envoyproxy#30596)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <ryan@synca.io>
  • Loading branch information
phlax authored Oct 30, 2023
1 parent 3bf9967 commit 9d24eda
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 96 deletions.
4 changes: 0 additions & 4 deletions .azure-pipelines/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ stages:
- env
checkStageDeps:
- env
macBuildStageDeps:
- env

# Postsubmit main/release branches
- ${{ if eq(variables.pipelinePostsubmit, true) }}:
Expand All @@ -94,5 +92,3 @@ stages:
- env
checkStageDeps:
- env
macBuildStageDeps:
- env
62 changes: 0 additions & 62 deletions .azure-pipelines/stage/macos.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .azure-pipelines/stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ parameters:
default:
- env
- prechecks
- name: macBuildStageDeps
displayName: "macOS stage dependencies"
type: object
default:
- env
- prechecks
- name: checkStageDeps
displayName: "Check stage dependencies"
type: object
Expand Down Expand Up @@ -151,14 +145,3 @@ stages:
- template: stage/verify.yml
parameters:
authGCP: $(GcpServiceAccountKey)

- stage: macos
displayName: macOS
dependsOn: ${{ parameters.macBuildStageDeps }}
variables:
RUN_BUILD: $[stageDependencies.env.repo.outputs['run.build']]
jobs:
- template: stage/macos.yml
parameters:
authGCP: $(GcpServiceAccountKey)
runBuild: variables['RUN_BUILD']
9 changes: 5 additions & 4 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,12 @@ build:windows --features=static_link_msvcrt
build:windows --dynamic_mode=off

# RBE (Google)
build:rbe-google --google_default_credentials=true
build:rbe-google --remote_cache=grpcs://remotebuildexecution.googleapis.com
build:cache-google --google_default_credentials=true
build:cache-google --remote_cache=grpcs://remotebuildexecution.googleapis.com
build:cache-google --remote_instance_name=projects/envoy-ci/instances/default_instance
build:cache-google --remote_timeout=7200
build:rbe-google --remote_executor=grpcs://remotebuildexecution.googleapis.com
build:rbe-google --remote_timeout=7200
build:rbe-google --remote_instance_name=projects/envoy-ci/instances/default_instance
build:rbe-google --config=cache-google

build:rbe-google-bes --bes_backend=grpcs://buildeventservice.googleapis.com
build:rbe-google-bes --bes_results_url=https://source.cloud.google.com/results/invocations/
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/envoy-macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Envoy/macos

permissions:
contents: read

on:
push:
branches:
- main
- release/v*
pull_request_target:

concurrency:
group: ${{ github.event.inputs.head_ref || github.run_id }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
env:
uses: ./.github/workflows/_env.yml
with:
prime_build_image: false
check_mobile_run: false

macos:
needs:
- env
strategy:
fail-fast: false
matrix:
include:
- target: ci/mac_ci_steps.sh
name: macOS
uses: ./.github/workflows/_ci.yml
name: CI ${{ matrix.name || matrix.target }}
secrets:
rbe-key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
with:
target: ${{ matrix.target }}
runs-on: macos-12-xl
command_ci:
command_prefix:
repo_ref: ${{ github.event.pull_request.merge_commit_sha }}
run-du: false
env: |
./ci/mac_ci_setup.sh
GCP_SERVICE_ACCOUNT_KEY_PATH=$(mktemp -t gcp_service_account.XXXXXX.json)
bash -c "echo \"${RBE_KEY}\" | base64 --decode > \"${GCP_SERVICE_ACCOUNT_KEY_PATH}\""
_BAZEL_BUILD_EXTRA_OPTIONS=(
--remote_download_toplevel
--flaky_test_attempts=2
--config=cache-google
--config=ci
--google_credentials=${GCP_SERVICE_ACCOUNT_KEY_PATH})
export BAZEL_BUILD_EXTRA_OPTIONS=${_BAZEL_BUILD_EXTRA_OPTIONS[*]}
9 changes: 0 additions & 9 deletions ci/mac_ci_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

set -e

function finish {
echo "disk space at end of build:"
df -h
}
trap finish EXIT

echo "disk space at beginning of build:"
df -h

read -ra BAZEL_BUILD_EXTRA_OPTIONS <<< "${BAZEL_BUILD_EXTRA_OPTIONS:-}"
read -ra BAZEL_EXTRA_TEST_OPTIONS <<< "${BAZEL_EXTRA_TEST_OPTIONS:-}"

Expand Down

0 comments on commit 9d24eda

Please sign in to comment.