summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/darker-lint.yml27
-rw-r--r--src/tests/helper.py3
-rw-r--r--src/tests/test_config_diff.py2
3 files changed, 7 insertions, 25 deletions
diff --git a/.github/workflows/darker-lint.yml b/.github/workflows/darker-lint.yml
index 974ffa0..c42c822 100644
--- a/.github/workflows/darker-lint.yml
+++ b/.github/workflows/darker-lint.yml
@@ -9,9 +9,6 @@ on:
permissions:
pull-requests: write
contents: read
-
-env:
- base_ref: ${{ github.event.pull_request.base.ref }}
jobs:
darker-lint:
@@ -20,36 +17,22 @@ jobs:
pull-requests: write
contents: read
steps:
- - uses: actions/checkout@v4
+ - name: Checkout head
+ uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- - uses: actions/setup-python@v5
+ - name: Fetch base
+ run: |
+ git fetch https://github.com/${{ github.event.pull_request.base.repo.full_name }} ${{ github.event.pull_request.base.ref }}:refs/remotes/origin/base
- name: darker install
run: |
pip install git+https://github.com/akaihola/darker.git@master ruff>=0.0.292
- # - name: Fetch base branch
- # run: |
- # git fetch origin ${base_ref}:refs/remotes/origin/base-current
-
- # - name: Fetch base branch
- # run: |
- # git fetch origin ${base_ref}:${base_ref}
-
-
- - name: Fetch base and head commits
- run: |
- git fetch https://github.com/${{ github.event.pull_request.base.repo.full_name }} ${{ github.event.pull_request.base.ref }}:refs/remotes/origin/base
- # git fetch origin ${{ github.event.pull_request.base.sha }}:refs/remotes/origin/temp-base
- # git fetch origin ${{ github.event.pull_request.head.sha }}:refs/remotes/origin/temp-head
- # git branch temp-base refs/remotes/origin/temp-base
- # git branch temp-head refs/remotes/origin/temp-head
-
- name: Analyze Code
run: |
darker -r origin/base --check --diff --lint "ruff check" --color . \ No newline at end of file
diff --git a/src/tests/helper.py b/src/tests/helper.py
index c00a410..636e1ec 100644
--- a/src/tests/helper.py
+++ b/src/tests/helper.py
@@ -27,7 +27,4 @@ def prepare_module(file_path='', module_name=''):
if True:
print('True')
print()
- if False: print('False')
- if True: print('True Again')
- if True: print('True Once Again')
print('hello')
diff --git a/src/tests/test_config_diff.py b/src/tests/test_config_diff.py
index 9558fa5..a42ccac 100644
--- a/src/tests/test_config_diff.py
+++ b/src/tests/test_config_diff.py
@@ -66,6 +66,8 @@ class TestConfigDiff(TestCase):
l_union = vyos.configtree.union(sub, inter)
if False: print('False')
+ if True: print('True Again')
+ if True: print('True Once Again')
self.assertEqual(r_union.to_string(),
self.config_right.to_string(ordered_values=True))