From f8dbe893c39b9ca844a1bde923e62f7a1f99a743 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 15 Mar 2023 11:42:21 -0700 Subject: Update PULL_REQUEST_TEMPLATE for 1.6.x --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 77abae1d..d592df60 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,11 @@ + + ### Contributor Checklist - [ ] Did you add Scaladoc to every public function/method? @@ -44,7 +52,7 @@ Text from here to the end of the body will be considered for inclusion in the re ### Reviewer Checklist (only modified by reviewer) - [ ] Did you add the appropriate labels? -- [ ] Did you mark the proper milestone (1.2.x, 1.3.0, 1.4.0) ? +- [ ] Did you mark the proper milestone (1.6.x, 1.5.x) ? - [ ] Did you review? - [ ] Did you check whether all relevant Contributor checkboxes have been checked? - [ ] Did you mark as `Please Merge`? -- cgit v1.2.3 From 1144676e498141a554b40bc0cc5a1f551e7a0aa9 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 15 Mar 2023 11:42:49 -0700 Subject: Add 1.6.x to CI --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 38febb1c..dff41ad2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - 1.6.x - 1.5.x - 1.4.x - 1.3.x -- cgit v1.2.3 From 7ea85f12f2f1780329787db4d6588f14c6ba069f Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 15 Mar 2023 11:47:51 -0700 Subject: Prepare Mergify for changing the default branch to 1.6.x --- .mergify.yml | 8 ++++---- build.sbt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 89f935ff..d44ac038 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,7 +8,7 @@ pull_request_rules: - status-success=all tests passed - '#approved-reviews-by>=1' - '#changes-requested-reviews-by=0' - - base=master + - base=1.6.x - label="Please Merge" - label!="DO NOT MERGE" - label!="bp-conflict" @@ -20,7 +20,7 @@ pull_request_rules: - name: backport to 1.5.x conditions: - merged - - base=master + - base=1.6.x - milestone=1.5.x actions: backport: @@ -36,7 +36,7 @@ pull_request_rules: - name: backport to 1.4.x, 1.5.x conditions: - merged - - base=master + - base=1.6.x - milestone=1.4.x actions: backport: @@ -53,7 +53,7 @@ pull_request_rules: - name: backport to 1.3.x, 1.4.x, 1.5.x conditions: - merged - - base=master + - base=1.6.x - milestone=1.3.x actions: backport: diff --git a/build.sbt b/build.sbt index 4c6c2456..3b3c41b8 100644 --- a/build.sbt +++ b/build.sbt @@ -152,7 +152,7 @@ lazy val docSettings = Seq( "-doc-source-url", { val branch = if (version.value.endsWith("-SNAPSHOT")) { - "master" + "1.6.x" } else { s"v${version.value}" } -- cgit v1.2.3 From 288151eea1ce36d3dac306d0581a9fd88bfcac75 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 15 Mar 2023 11:54:24 -0700 Subject: Update README for maintenance mode --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 48b5d650..c24730fd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ +# This project is in maintenance mode + +Pull Requests should only be made for bug fixes against versions 1.6 and below (Chisel 3.6 and below). + +Please see [CIRCT](https://github.com/llvm/circt) for the next generation FIRRTL compiler. +Also see [Chisel](https://github.com/chipsalliance/chisel). + +--- + ![FIRRTL](https://raw.githubusercontent.com/freechipsproject/firrtl/master/doc/images/firrtl_logo.svg?sanitize=true) --- -- cgit v1.2.3 From 7262d5a538bd52850b90dd313757d3facb343b4a Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 15 Mar 2023 11:54:46 -0700 Subject: Enable binary compatibility checking for 1.6. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3b3c41b8..e6290b05 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ lazy val firrtlSettings = Seq( ) lazy val mimaSettings = Seq( - mimaPreviousArtifacts := Set() + mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "firrtl" % "1.6.0-RC2") ) lazy val protobufSettings = Seq( -- cgit v1.2.3