From 76ea088c87bd55f92688f4fe895594d77c98c9a2 Mon Sep 17 00:00:00 2001 From: Nikita Yakovlev Date: Mon, 6 Jan 2025 18:15:53 +0300 Subject: [PATCH 1/6] combining an action in a single file --- .github/workflows/{lint.yml => CI.yml} | 23 +++++++++--------- .github/workflows/test.yml | 33 -------------------------- 2 files changed, 12 insertions(+), 44 deletions(-) rename .github/workflows/{lint.yml => CI.yml} (53%) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/CI.yml similarity index 53% rename from .github/workflows/lint.yml rename to .github/workflows/CI.yml index ee78236..522d7dd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/CI.yml @@ -1,18 +1,20 @@ -name: Run Linter +name: CI on: + push: + branches: + - main pull_request: branches: - main - - develop jobs: - lint: + check: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 @@ -20,14 +22,13 @@ jobs: python-version: '3.12' - name: Install Poetry - run: | - curl -sSL https://install.python-poetry.org | python3 - - export PATH="$HOME/.local/bin:$PATH" + run: pip install poetry - name: Install dependencies - run: | - poetry install + run: poetry install - name: Run linter - run: | - poetry run lint \ No newline at end of file + run: poetry run lint + + - name: Run tests + run: poetry run test \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index e02ac8e..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Run Tests - -on: - pull_request: - branches: - - main - - develop - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.12' - - - name: Install Poetry - run: | - curl -sSL https://install.python-poetry.org | python3 - - export PATH="$HOME/.local/bin:$PATH" - - - name: Install dependencies - run: | - poetry install - - - name: Run tests - run: | - poetry run test \ No newline at end of file From be9f4d6b2ba081ac40fbacd4fa07e75803e27195 Mon Sep 17 00:00:00 2001 From: Nikita Yakovlev Date: Mon, 6 Jan 2025 18:25:34 +0300 Subject: [PATCH 2/6] debug steps --- .github/workflows/CI.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 522d7dd..e9a1e1d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,7 +9,7 @@ on: - main jobs: - check: + Check: runs-on: ubuntu-latest steps: @@ -27,8 +27,11 @@ jobs: - name: Install dependencies run: poetry install + - name: print dir + run: ls -la + - name: Run linter - run: poetry run lint + run: poetry run -vvv lint - name: Run tests run: poetry run test \ No newline at end of file From 77ceab1cb7af7c5e4e05a8de651f2ebef4f023c5 Mon Sep 17 00:00:00 2001 From: Nikita Yakovlev Date: Mon, 6 Jan 2025 18:34:32 +0300 Subject: [PATCH 3/6] re-name script --- pyproject.toml | 2 +- scripts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 73b2575..c5729c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ Issues = "https://github.com/Nottezz/format-fusion-cli/issues" [tool.poetry.scripts] format-fusion = "formatfusion.__main__:__main__" lint = "scripts:lint" -format = "scripts:format" +formating = "scripts:formating" test = "scripts:test" [tool.poetry.dependencies] diff --git a/scripts.py b/scripts.py index 8e464c2..27a30ee 100644 --- a/scripts.py +++ b/scripts.py @@ -65,7 +65,7 @@ def lint(): logger.info("Mypy check passed") -def format(): +def formating(): if len(sys.argv) > 1: logger.warning("format not support arguments") logger.warning("Ignoring arguments: %s", sys.argv[1:]) From 41d9e7f8381dd0b62d5e51359f5527bab1b59bd2 Mon Sep 17 00:00:00 2001 From: Nikita Yakovlev Date: Mon, 6 Jan 2025 18:37:18 +0300 Subject: [PATCH 4/6] clear Poetry cache --- .github/workflows/CI.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e9a1e1d..7ae95cf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,6 +21,9 @@ jobs: with: python-version: '3.12' + - name: Clear Poetry cache + run: poetry cache clear --all pypi + - name: Install Poetry run: pip install poetry From 073e517c08c88e012fbc35008be55f083e51b4f6 Mon Sep 17 00:00:00 2001 From: Nikita Yakovlev Date: Mon, 6 Jan 2025 18:37:18 +0300 Subject: [PATCH 5/6] clear Poetry cache --- .github/workflows/CI.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e9a1e1d..b2fc993 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -24,6 +24,9 @@ jobs: - name: Install Poetry run: pip install poetry + - name: Clear Poetry cache + run: poetry cache clear --all pypi + - name: Install dependencies run: poetry install From f13bc4cc01daf22127797523c283b6684f2b5dcc Mon Sep 17 00:00:00 2001 From: Nikita Yakovlev Date: Mon, 6 Jan 2025 18:39:47 +0300 Subject: [PATCH 6/6] clear Poetry cache --- .github/workflows/CI.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4408058..b2fc993 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,9 +21,6 @@ jobs: with: python-version: '3.12' - - name: Clear Poetry cache - run: poetry cache clear --all pypi - - name: Install Poetry run: pip install poetry