Skip to content

Commit

Permalink
Update CI configurations
Browse files Browse the repository at this point in the history
1. Test on current stable release branch
2. Merge macos.yml into main.yml

(cherry picked from commit 1122d8f)
  • Loading branch information
ting-yuan committed Oct 12, 2021
1 parent 484e46c commit 6d72783
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6d72783

Please sign in to comment.