commit 6d72783b8cc372195e9e9e42b06c9a92109de207
author Ting-Yuan Huang <laszio@google.com> Tue Oct 12 10:27:21 2021 -0700
committer laszio <ting-yuan@users.noreply.github.com> Tue Oct 12 12:15:41 2021 -0700
tree 0255390017a66cf3b6dbd1f81d86dc297279b9be
parent 484e46cb1a59d14695d816ea6c2c989948dec942

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8209ca6..eb8f9c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,17 +4,19 @@
 
 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