Merge pull request #101 from a-kenji/development

.github/dependabot.yml

@@ -4,8 +4,10 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "development"
 
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "development"

.github/workflows/actionlint.yml

@@ -3,11 +3,11 @@ name: "actionlint"
 on:
   workflow_dispatch: # allows manual triggering
   pull_request:
-    branches: [ main ]
+    branches: [ release, development]
     paths-ignore:
       - '**.md'
   push:
-    branches: [ main ]
+    branches: [ release, development ]
     paths-ignore:
       - '**.md'
   merge_group:

.github/workflows/ci.yml

@@ -4,9 +4,9 @@ name: "ci"
 on:
   workflow_dispatch: # allows manual triggering
   pull_request:
-    branches: [ main ]
+    branches: [ release, development ]
   push:
-    branches: [ main ]
+    branches: [ release, development ]
   merge_group:
 
 jobs:

.github/workflows/darwin.yml

@@ -2,8 +2,9 @@ name: darwin
 
 on:
   pull_request:
-    branches:
-      - main
+    branches: [ release, development ]
+    paths-ignore:
+      - '**.md'
   merge_group:
 
 jobs:

.github/workflows/nix-develop.yml

@@ -5,14 +5,14 @@ name: "nix develop"
 on:
   workflow_dispatch: # allows manual triggering
   pull_request:
-    branches: [ main ]
+    branches: [ release, development ]
     paths:
       - '**.nix'
       - 'flake.lock'
       - 'flake.nix'
       - 'rust-toolchain.toml'
   push:
-    branches: [ main ]
+    branches: [ release, development ]
     paths:
       - '**.nix'
       - 'flake.lock'

.github/workflows/nix.yml

@@ -3,11 +3,11 @@ name: "nix"
 on:
   workflow_dispatch: # allows manual triggering
   pull_request:
-    branches: [ main ]
+    branches: [ release, development ]
     paths-ignore:
       - '**.md'
   push:
-    branches: [ main ]
+    branches: [ release, development ]
     paths-ignore:
       - '**.md'
   merge_group:

.github/workflows/update-flake-lock.yml

@@ -20,6 +20,7 @@ jobs:
         uses: DeterminateSystems/update-flake-lock@v20
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
+          branch: development
           pr-labels: |
             dependencies
             automated

.github/workflows/update-rust-toolchain.yml

@@ -19,6 +19,7 @@ jobs:
         with:
           toolchain-path: './rust-toolchain.toml'
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
+          pr-branch: development
           pr-labels: |
             dependencies
             automated

docs/CONTRIBUTING.md

@@ -3,6 +3,10 @@ Thank you for considering to contribute.
 You are invited to contribute new features, fixes or updates, large or small.
 We are always happy to receive contributions and attempt to process them in a timely manner.
 
+## Branches
+Releases will be cut on the `release` branch.
+Most PR`s and features should land on the `development` branch.
+
 ## Issues
 To get an overview of what can be worked on, please take a look at the [issues](https://github.com/a-kenji/tui-term/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc).