Skip to content

Commit

Permalink
Move non-linux builds to github
Browse files Browse the repository at this point in the history
This allows CI to still check windows/macos compile, but actually run in parallel rather than serializing on each platform and wasting valuable CI time
  • Loading branch information
Jake-Shadle committed Mar 1, 2024
1 parent 1711b49 commit 4bab636
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
20 changes: 18 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# with auto-merge enabled and update it to the latest `main`, forming a best-effort queue
# of approved PRs.

name: Validate protobufs
name: CI

on:
push:
Expand All @@ -30,10 +30,26 @@ concurrency:
cancel-in-progress: true

jobs:
validate:
validate-proto-bufs:
name: Validate proto bufs
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
submodules: true
- run: cargo run -p proto-gen -- validate

build:
name: Build
strategy:
matrix:
os: [windows-2022, macos-14]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- run: cargo fetch
- run: cargo build
10 changes: 5 additions & 5 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

steps:
- name: gcr.io/cloud-builders/git
args: [ submodule, update, --init, --recursive ]
args: [submodule, update, --init, --recursive]
id: fetch-git-submodules
waitFor:
- "-"
- name: gcr.io/cloud-builders/docker
args: [ pull, "${_BUILD_IMAGE_TAG}" ]
args: [pull, "${_BUILD_IMAGE_TAG}"]
id: pull-build-image
waitFor:
- "-" # Run immediately, don't wait for any previous steps
Expand All @@ -44,7 +44,7 @@ steps:
- name: us-docker.pkg.dev/$PROJECT_ID/ci/make-docker
dir: ./build
args:
- build
- build-image
id: build

#
Expand All @@ -56,7 +56,7 @@ steps:
dir: ./build
entrypoint: bash
args:
- '-c'
- "-c"
- 'timeout --signal=INT --preserve-status 5s docker run --rm -v "/workspace/examples/proxy.yaml:/etc/quilkin/quilkin.yaml" ${_REPOSITORY}quilkin:$(make version) proxy'
id: test-quilkin-image-default-config-file
waitFor:
Expand All @@ -67,7 +67,7 @@ steps:
dir: ./build
entrypoint: bash
args:
- '-c'
- "-c"
- 'timeout --signal=INT --preserve-status 5s docker run -v /tmp:/etc/quilkin/ --rm ${_REPOSITORY}quilkin:$(make version) proxy --to="127.0.0.1:0"'
id: test-quilkin-image-command-line
waitFor:
Expand Down

0 comments on commit 4bab636

Please sign in to comment.