Merge branch 'main' into work-in-progress

.github/workflows/manual.yml

@@ -0,0 +1,37 @@
+name: Automerge
+
+on:
+  push:
+    branches:
+      - 'work-in-progress'
+
+
+env:
+  # replace "github_username" with your GitHub username
+  # replace "github.com/username/repo.git" with your GitHub repo path
+  # do NOT replace ${{secrets.GITHUB_TOKEN}}, GitHub will take care of it
+  MY_REPO: https://taoria:${{secrets.GITHUB_TOKEN}}@github.com/taoria/T-Node.git
+
+  # replace "long-lived_branch_name" with your branch name
+  MY_BRANCH: work-in-progress
+
+  # replace it with the path to master repo
+  MASTER_REPO: https://github.com/taoria/T-Node.git
+
+  # replace "master" with your master branch name
+  MASTER_BRANCH: main
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Merge with master
+      run: |
+        git clone ${{env.MY_REPO}} -b ${{env.MY_BRANCH}} tmp
+        cd tmp
+        git config user.name "Automerge Bot"
+        git config user.email "bot@example.com"
+        git config pull.rebase false
+        git pull ${{env.MASTER_REPO}} ${{env.MASTER_BRANCH}}
+        git push

.github/workflows/merge.yml

@@ -0,0 +1,33 @@
+# This is a basic workflow that is manually triggered
+
+name: Manual workflow
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - work-in-progress
+      
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "merge"
+  merge:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Runs a single command using the runners shell
+    - name: Up merge
+      # You may pin to the exact commit or the version.
+      # uses: bambamboole/gha-upmerge@de87b212278009f9ace0ba024701890b9eb3281b
+      uses: bambamboole/gha-upmerge@v1.0.1
+      with:
+        # Name of the branch to merge from
+        from_branch: work-in-progress
+
+        to_branch: main
+