From ba76cefc39e0b9b50dd8416e76f4d3e6f6ce8aff Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 26 Nov 2020 21:49:14 +0100 Subject: add github actions --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitmodules (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..d3d92138 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "docs/_include/vyos-1x"] + path = docs/_include/vyos-1x + url = https://github.com/vyos/vyos-1x + branch = current -- cgit v1.2.3 From bd631530b21be71277f8e0d5545f087d5c4d49cb Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 26 Nov 2020 22:20:53 +0100 Subject: remove submodule --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .gitmodules (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d3d92138..00000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "docs/_include/vyos-1x"] - path = docs/_include/vyos-1x - url = https://github.com/vyos/vyos-1x - branch = current -- cgit v1.2.3 From d4863cc15079682634ecca21dd87442ae3cb5666 Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 26 Nov 2020 22:32:45 +0100 Subject: add vyos-1x submodule --- .gitmodules | 4 ++++ docs/_include/vyos-1x | 1 + 2 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 docs/_include/vyos-1x (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..d3d92138 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "docs/_include/vyos-1x"] + path = docs/_include/vyos-1x + url = https://github.com/vyos/vyos-1x + branch = current diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x new file mode 160000 index 00000000..64d6e689 --- /dev/null +++ b/docs/_include/vyos-1x @@ -0,0 +1 @@ +Subproject commit 64d6e689a8274845a49e6931eda6cda04615de42 -- cgit v1.2.3 From f7749b67c67c7addcd8a6bf676f1c9ab418fea53 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Wed, 3 Feb 2021 16:02:18 +0100 Subject: Coverage: reenable coverage page progress (#441) * Github: correct branch for vyos-1x submodule * Coverage: reenable coverage page progress * Update vyos-1x submodule (#24) Co-authored-by: rebortg Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: rebortg --- .github/workflows/submodules.yml | 2 +- .gitmodules | 2 +- docs/_ext/vyos.py | 4 ++-- docs/_include/vyos-1x | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to '.gitmodules') diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml index 129cc895..ccbb64a6 100644 --- a/.github/workflows/submodules.yml +++ b/.github/workflows/submodules.yml @@ -16,7 +16,7 @@ jobs: git submodule status git submodule update --init --force cd docs/_include/vyos-1x - git checkout current + git checkout equuleus git pull git submodule status - name: Create Pull Request diff --git a/.gitmodules b/.gitmodules index d3d92138..ff51611b 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 = current + branch = equuleus diff --git a/docs/_ext/vyos.py b/docs/_ext/vyos.py index a4e130e5..46ebae36 100644 --- a/docs/_ext/vyos.py +++ b/docs/_ext/vyos.py @@ -20,8 +20,8 @@ def setup(app): app.add_config_value( 'vyos_working_commands', - #get_working_commands(), - {"cfgcmd": [], "opcmd": []}, + get_working_commands(), + #{"cfgcmd": [], "opcmd": []}, 'html' ) app.add_config_value( diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x index 8076176e..86209c67 160000 --- a/docs/_include/vyos-1x +++ b/docs/_include/vyos-1x @@ -1 +1 @@ -Subproject commit 8076176ec68915b1148829f63ad3da25441f27e7 +Subproject commit 86209c679c6b7ca9d5bac1f67ffd391b9b16c008 -- cgit v1.2.3 From 14de62ec052855f03f37fc06817f9270a19ee9d0 Mon Sep 17 00:00:00 2001 From: rebortg Date: Sat, 6 Feb 2021 18:27:49 +0100 Subject: Github: adjust githubactions for sagitta and equuleus --- .github/workflows/submodules.yml | 38 ++++++++++++++++++++++++++++++++++---- .gitmodules | 2 +- 2 files changed, 35 insertions(+), 5 deletions(-) (limited to '.gitmodules') 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,12 +5,41 @@ 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 with: repository: ${{ github.repository }} + - name: update submodule + run: | + 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 + 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 @@ -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 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 -- cgit v1.2.3