summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/submodules.yml38
-rw-r--r--.gitmodules2
2 files changed, 35 insertions, 5 deletions
diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml
index ccbb64a6..82b8d4e4 100644
--- a/.github/workflows/submodules.yml
+++ b/.github/workflows/submodules.yml
@@ -5,7 +5,7 @@ on:
# 06:00 UTC on Monday
- cron: '0 6 * * 1'
jobs:
- updatVyOS-1x:
+ updateVyOS-1x_master:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -16,6 +16,35 @@ jobs:
git submodule status
git submodule update --init --force
cd docs/_include/vyos-1x
+ git checkout current
+ git pull
+ git submodule status
+ - name: Create Pull Request
+ uses: peter-evans/create-pull-request@v3
+ with:
+ token: ${{secrets.GITHUB_TOKEN}}
+ commit-message: "vyos-1x: update current branch"
+ committer: GitHub <noreply@github.com>
+ author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+ title: "vyos-1x: update current branch"
+ body: |
+ Autoupdate vyos-1x submodule
+ branch: update-dependencies-master
+ delete-branch: true
+
+
+ updateVyOS-1x_equuleus:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ repository: ${{ github.repository }}
+ ref: equuleus
+ - name: update submodule
+ run: |
+ git submodule status
+ git submodule update --init --force
+ cd docs/_include/vyos-1x
git checkout equuleus
git pull
git submodule status
@@ -23,10 +52,11 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
token: ${{secrets.GITHUB_TOKEN}}
- commit-message: Update vyos-1x submodule
+ commit-message: "vyos-1x: update equuleus branch"
committer: GitHub <noreply@github.com>
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
- title: Update vyos-1x submodule
+ title: "vyos-1x: update equuleus branch"
body: |
Autoupdate vyos-1x submodule
- branch: update-dependencies
+ branch: update-dependencies-equuleus
+ delete-branch: true
diff --git a/.gitmodules b/.gitmodules
index ff51611b..d3d92138 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "docs/_include/vyos-1x"]
path = docs/_include/vyos-1x
url = https://github.com/vyos/vyos-1x
- branch = equuleus
+ branch = current