From 6d72783b8cc372195e9e9e42b06c9a92109de207 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Tue, 12 Oct 2021 10:27:21 -0700 Subject: [PATCH] Update CI configurations 1. Test on current stable release branch 2. Merge macos.yml into main.yml (cherry picked from commit 1122d8f29c87f7fdaebaea4406449af609db9e7c) --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8209ca6c64..eb8f9c26ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,17 +4,19 @@ name: CI on: push: - branches: [ main, kotlin-1.5.30 ] + branches: [ main, kotlin-1.6.0, 1.0.0-release ] pull_request: - branches: [ main, kotlin-1.5.30 ] + branches: [ main, kotlin-1.6.0, 1.0.0-release ] jobs: build-and-test: strategy: fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest] # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} steps: - name: Setup Java 9