From ba76cefc39e0b9b50dd8416e76f4d3e6f6ce8aff Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 26 Nov 2020 21:49:14 +0100 Subject: add github actions --- .github/workflows/main.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/main.yml (limited to '.github/workflows') diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..b6797ce0 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,32 @@ +name: Linting +on: + pull_request: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: File Changes + id: file_changes + uses: trilom/file-changes-action@v1.2.3 + + - name: Vale + uses: errata-ai/vale-action@v1.3.0 + with: + files: '${{ steps.file_changes.outputs.files_modified }}' + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: run python based linter + run: python .github/vyos-linter.py '${{ steps.file_changes.outputs.files_modified }}' + + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + -- cgit v1.2.3 From 4dfdd5057ea801c69f48f1aa83700a2915c1775c Mon Sep 17 00:00:00 2001 From: rebortg Date: Wed, 9 Dec 2020 14:17:47 +0100 Subject: Lint: deativate vale action --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b6797ce0..eb04d97f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,10 +13,10 @@ jobs: id: file_changes uses: trilom/file-changes-action@v1.2.3 - - name: Vale - uses: errata-ai/vale-action@v1.3.0 - with: - files: '${{ steps.file_changes.outputs.files_modified }}' + #- name: Vale + # uses: errata-ai/vale-action@v1.3.0 + # with: + # files: '${{ steps.file_changes.outputs.files_modified }}' - name: Set up Python uses: actions/setup-python@v2 -- cgit v1.2.3 From 72701bf825e17eae2938b880a230afb9f09e8b3e Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 10 Dec 2020 08:44:34 +0100 Subject: create gihub action for scheduled submodule update --- .github/workflows/submodules.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/submodules.yml (limited to '.github/workflows') diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml new file mode 100644 index 00000000..0e501bdd --- /dev/null +++ b/.github/workflows/submodules.yml @@ -0,0 +1,32 @@ +name: Update submodule vyos-1x +on: + workflow_dispatch: + schedule: + # 06:00 UTC on Monday + - cron: '0 6 * * 1' +jobs: + updatVyOS-1x: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + repository: rebortg/vyos-documentation + - 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: Update vyos-1x submodule + committer: GitHub + author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> + title: Update vyos-1x submodule + body: | + Autoupdate vyos-1x submodule + branch: update-dependencies -- cgit v1.2.3 From 335ef02956f87bf2bf5b5ce0b5b295f29fe20b8f Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 10 Dec 2020 08:46:39 +0100 Subject: correct repo path for submodule action --- .github/workflows/submodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml index 0e501bdd..66ecdf3e 100644 --- a/.github/workflows/submodules.yml +++ b/.github/workflows/submodules.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - repository: rebortg/vyos-documentation + repository: vyos/vyos-documentation - name: update submodule run: | git submodule status -- cgit v1.2.3 From 92e54bfb89bf27b98414845bbc993795a94595bf Mon Sep 17 00:00:00 2001 From: rebortg Date: Thu, 17 Dec 2020 20:38:52 +0100 Subject: CI: use variable for repo name --- .github/workflows/submodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml index 66ecdf3e..129cc895 100644 --- a/.github/workflows/submodules.yml +++ b/.github/workflows/submodules.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - repository: vyos/vyos-documentation + repository: ${{ github.repository }} - name: update submodule run: | git submodule status -- 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 '.github/workflows') 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 '.github/workflows') 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