-
Notifications
You must be signed in to change notification settings - Fork 614
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Switch to using Github Actions CI (#1690) MiMa binary compatibility checks are now run on master, but the mimaPreviousArtifacts are empty which makes the check a no-op. This helps keep both the build.sbt and CI more consistent between master and stable branches. .mergify.yml is also updated with mergify.sc from chisel-repo-tools using the following configuration: conditions: - status-success=all tests passed branches: - 3.2.x - 3.3.x - 3.4.x (cherry picked from commit 25a417f) # Conflicts: # .mergify.yml # build.sbt # project/plugins.sbt * Resolve merge conflicts Co-authored-by: Jack Koenig <[email protected]>
- Loading branch information
1 parent
b9b962a
commit 0ee48dd
Showing
4 changed files
with
155 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: Continuous Integration | ||
|
|
||
| on: [pull_request] | ||
|
|
||
| jobs: | ||
| ci: | ||
| name: ci | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| scala: [2.12.12, 2.11.12] | ||
| container: | ||
| image: ucbbar/chisel3-tools | ||
| options: --user github --entrypoint /bin/bash | ||
| env: | ||
| CONTAINER_HOME: /home/github | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| - name: Setup Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| with: | ||
| java-version: [email protected] | ||
| - name: Cache Scala | ||
| uses: coursier/cache-action@v5 | ||
| - name: Documentation (Scala 2.12 only) | ||
| if: matrix.scala == '2.12.12' | ||
| run: sbt ++${{ matrix.scala }} docs/mdoc | ||
| - name: Test | ||
| run: sbt ++${{ matrix.scala }} test | ||
| - name: Binary compatibility | ||
| run: sbt ++${{ matrix.scala }} mimaReportBinaryIssues | ||
|
|
||
|
|
||
| # Sentinel job to simplify how we specify which checks need to pass in branch | ||
| # protection and in Mergify | ||
| # | ||
| # When adding new jobs, please add them to `needs` below | ||
| all_tests_passed: | ||
| name: "all tests passed" | ||
| needs: [ci] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - run: echo Success! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,107 @@ | ||
| pull_request_rules: | ||
| - name: remove outdated reviews | ||
| conditions: | ||
| - base=master | ||
| actions: | ||
| dismiss_reviews: | ||
| - name: automatic squash-and-merge on CI success and review | ||
| conditions: | ||
| - status-success=all tests passed | ||
| - '#approved-reviews-by>=1' | ||
| - '#changes-requested-reviews-by=0' | ||
| - base=master | ||
| - label="Please Merge" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge | ||
| - name: backport to 3.4.x | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - milestone=3.4.x | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - 3.4.x | ||
| ignore_conflicts: true | ||
| label_conflicts: bp-conflict | ||
| label: | ||
| add: | ||
| - Backported | ||
| - name: backport to 3.3.x, 3.4.x | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - milestone=3.3.x | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - 3.3.x | ||
| - 3.4.x | ||
| ignore_conflicts: true | ||
| label_conflicts: bp-conflict | ||
| label: | ||
| add: | ||
| - Backported | ||
| - name: backport to 3.2.x, 3.3.x, 3.4.x | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - milestone=3.2.x | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - 3.2.x | ||
| - 3.3.x | ||
| - 3.4.x | ||
| ignore_conflicts: true | ||
| label_conflicts: bp-conflict | ||
| label: | ||
| add: | ||
| - Backported | ||
| - name: label Mergify backport PR | ||
| conditions: | ||
| - body~=This is an automated backport of pull request \#\d+ done by Mergify | ||
| actions: | ||
| label: | ||
| add: | ||
| - Backport | ||
| - name: automatic squash-and-mege of 3.2.x backport PRs | ||
| conditions: | ||
| - status-success=all tests passed | ||
| - '#changes-requested-reviews-by=0' | ||
| - base=3.2.x | ||
| - label="Backport" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge | ||
| - name: automatic squash-and-mege of 3.3.x backport PRs | ||
| conditions: | ||
| - status-success=all tests passed | ||
| - '#changes-requested-reviews-by=0' | ||
| - base=3.3.x | ||
| - label="Backport" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge | ||
| - name: automatic squash-and-mege of 3.4.x backport PRs | ||
| conditions: | ||
| - status-success=all tests passed | ||
| - '#changes-requested-reviews-by=0' | ||
| - base=3.4.x | ||
| - label="Backport" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge | ||
|
|
||
| pull_request_rules: | ||
| - name: automatic squash-and-merge on CI success and review | ||
| conditions: | ||
| - "status-success=ci/circleci: build-firrtl" | ||
| - "status-success=ci/circleci: build-prep" | ||
| - "status-success=ci/circleci: test-chisel-2_11" | ||
| - "status-success=ci/circleci: test-chisel-2_12" | ||
| - status-success=license/cla | ||
| - "#approved-reviews-by>=1" | ||
| - "#changes-requested-reviews-by=0" | ||
| - base=master | ||
| - label="Please Merge" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge | ||
|
|
||
| - name: backport to 3.3.x | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - milestone=3.3.x | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - 3.3.x | ||
| ignore_conflicts: True | ||
| label_conflicts: "bp-conflict" | ||
| label: | ||
| add: [Backported] | ||
|
|
||
| - name: backport to 3.2.x and 3.3.x | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - milestone=3.2.x | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - 3.2.x | ||
| - 3.3.x | ||
| ignore_conflicts: True | ||
| label_conflicts: "bp-conflict" | ||
| label: | ||
| add: [Backported] | ||
|
|
||
| - name: label Mergify backport PR | ||
| conditions: | ||
| - body~=This is an automated backport of pull request \#\d+ done by Mergify | ||
| actions: | ||
| label: | ||
| add: [Backport] | ||
|
|
||
| - name: automatic squash-and-merge of 3.3.x backport PRs | ||
| conditions: | ||
| - "status-success=ci/circleci: build-firrtl" | ||
| - "status-success=ci/circleci: build-prep" | ||
| - "status-success=ci/circleci: test-chisel-2_11" | ||
| - "status-success=ci/circleci: test-chisel-2_12" | ||
| - "status-success=ci/circleci: check-binary-compatibility" | ||
| - status-success=license/cla | ||
| - "#changes-requested-reviews-by=0" | ||
| - base=3.3.x | ||
| - label="Backport" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge | ||
|
|
||
| - name: automatic squash-and-merge of 3.2.x backport PRs | ||
| conditions: | ||
| - "status-success=ci/circleci: build-firrtl" | ||
| - "status-success=ci/circleci: build-prep" | ||
| - "status-success=ci/circleci: test-chisel-2_11" | ||
| - "status-success=ci/circleci: test-chisel-2_12" | ||
| - "status-success=ci/circleci: check-binary-compatibility" | ||
| - status-success=license/cla | ||
| - "#changes-requested-reviews-by=0" | ||
| - base=3.2.x | ||
| - label="Backport" | ||
| - label!="DO NOT MERGE" | ||
| - label!="bp-conflict" | ||
| actions: | ||
| merge: | ||
| method: squash | ||
| strict: smart | ||
| strict_method: merge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters