Merge pull request #199 from zzak/3.x-changelog

Add changelogs for #197 and #198
rails · Mar 6, 2023 · ec29fc4 · ec29fc4
2 parents 9a66648 + 59bd616
commit ec29fc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: Tests
 on:
   push:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '0 0 * * *'
 
@@ -13,17 +13,11 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.1'
-          - '2.2'
-          - '2.3'
-          - '2.4'
-          - '2.5'
-          - '2.6'
           - '2.7'
           - '3.0'
+          - '3.1'
+          - '3.2'
           - 'ruby-head'
-          - 'jruby-head'
-          - 'truffleruby-head'
 
     steps:
       - uses: actions/checkout@v1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
-Master
-======
+Main (3.0.0.alpha)
+==================
 
+* [#198](https://github.com/zzak/sdoc/pull/198) Bump version to 3.0.0.alpha [@zzak](https://github.com/zzak)
+* [#197](https://github.com/zzak/sdoc/pull/197) Remove sdoc-merge and sdoc template [@zzak](https://github.com/zzak)
 * [#195](https://github.com/zzak/sdoc/pull/195) Replace turbolinks with turbo v7.3.0 [@zzak](https://github.com/zzak)
 
 2.6.1