Merge pull request #3 from Cygnomatic/main

sync: main to wsl2
cygnomatic · Dec 7, 2023 · 3ea0ed2 · 3ea0ed2
2 parents a68990f + 845adcc
commit 3ea0ed2
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 98 deletions.
diff --git a/.github.bak/actions/lint/action.yml b/.github.bak/actions/lint/action.yml
diff --git a/.github.bak/actions/lint/run.sh b/.github.bak/actions/lint/run.sh
diff --git a/.github.bak/actions/test/action.yml b/.github.bak/actions/test/action.yml
diff --git a/.github.bak/actions/test/run.sh b/.github.bak/actions/test/run.sh
diff --git a/.github.bak/dependabot.yml b/.github.bak/dependabot.yml
diff --git a/.github.bak/workflows/docs.yaml b/.github.bak/workflows/docs.yaml
diff --git a/.github.bak/workflows/ros.yaml b/.github.bak/workflows/ros.yaml
diff --git a/.github/workflows/sync_branches.yaml b/.github/workflows/sync_branches.yaml
@@ -17,4 +17,5 @@ jobs:
         with:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           FROM_BRANCH: "main"
-          TO_BRANCH: "wsl2"
+          TO_BRANCH: "wsl2"
+          PULL_REQUEST_AUTO_MERGE_METHOD: "merge"