Refactoring

.dockerignore

@@ -10,3 +10,4 @@ venv
 build
 **/*.egg-info
 **/model_pb2*
+linters

.github/workflows/build.yml

@@ -1,83 +1,97 @@
 name: Python build
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
+  build_image:
+    name: Build Image
+    runs-on: [ self-hosted, small ]
+    steps:
+      - uses: actions/checkout@v4
 
-  build:
-    runs-on: ubuntu-latest
-    # Consistent with base image in Dockerfile
-    # container: stepik/hyperstyle-base:py3.8.11-java11.0.11-node14.17.3-go1.18.5
-    container: nastyabirillo/hyperstyle:1.4.4
+      - uses: docker/login-action@v3
+        with:
+          registry: hyperskill.azurecr.io
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - uses: docker/setup-buildx-action@v3
 
+      - name: Build and push server image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          pull: true
+          push: true
+          tags: hyperskill.azurecr.io/hyperstyle:${{ github.sha }}
+          cache-from: |
+            type=gha
+            type=gha,scope=main
+          cache-to: type=gha,mode=max
+
+  tests:
+    name: Tests
+    needs:
+      - build_image
+    runs-on: [ self-hosted, small ]
+    container:
+      image: hyperskill.azurecr.io/hyperstyle:${{ github.sha }}
+      credentials:
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_PASSWORD }}
     steps:
-      - name: Install git
+      - name: Run tests
         run: |
-          apt-get update
-          apt-get -y install git
+          cd /review
+          /hyperstyle/bin/pytest
 
+  build:
+    runs-on: [ self-hosted, small ]
+    needs:
+      - build_image
+    container:
+      image: hyperskill.azurecr.io/hyperstyle:${{ github.sha }}
+      credentials:
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_PASSWORD }}
+    steps:
       - name: Check env variables
         run: |
           echo $DETEKT_DIRECTORY && echo $DETEKT_VERSION
           echo $CHECKSTYLE_DIRECTORY && echo $CHECKSTYLE_VERSION
           echo $PMD_DIRECTORY && echo $PMD_VERSION
           echo $GOLANG_LINT_DIRECTORY && echo $GOLANG_LINT_VERSION
 
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install development requirements
-        run: |
-          pip install --no-cache-dir -r requirements-dev.txt
-
-      - name: Install the tool
-        run: |
-          pip install --no-cache-dir . --use-feature=in-tree-build
-
-      - name: Set up git rights
-        run: |
-          git config --global --add safe.directory '*'
-
       - name: Lint with flake8
         run: |
+          cd /review
           # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules,hyperstyle/src/python/review/inspectors/common/inspector/proto
+          /hyperstyle/bin/flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules,hyperstyle/src/python/review/inspectors/common/inspector/proto
 
           # TODO: change max-complexity into 10 after refactoring
           # TODO: remove R504, A003, E800, E402, WPS1, WPS2, WPS3, WPS4, WPS5, WPS6, H601
-          flake8 . --count --max-complexity=11 --max-line-length=120 --max-doc-length=120 --ignore=R504,A003,E800,E402,W503,WPS,H601,N400,I100,I201,I202, --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules,hyperstyle/src/python/review/inspectors/common/inspector/proto
-
-
-      - name: Sort whitelists
-        run: |
-          for file in "whitelist.txt" "hyperstyle/src/python/review/inspectors/flake8/whitelist.txt"
-          do
-          LC_ALL=C sort $file -o $file
-          done
-
-      - name: Commit sorted whitelists
-        uses: EndBug/add-and-commit@v7.2.1
-        with:
-          add: "['whitelist.txt', 'hyperstyle/src/python/review/inspectors/flake8/whitelist.txt']"
-          message: 'Sort whitelists (Github Actions)'
-
-      - name: Set up Eslint
-        run: |
-          # Consistent with eslint version in Dockerfile
-          npm install eslint@7.5.0 -g && eslint --init
+          /hyperstyle/bin/flake8 . --count --max-complexity=11 --max-line-length=120 --max-doc-length=120 --ignore=R504,A003,E800,E402,W503,WPS,H601,N400,I100,I201,I202, --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules,hyperstyle/src/python/review/inspectors/common/inspector/proto
 
       - name: Check installed module can run python linters
         run: |
-          review test/resources/inspectors/python/case39_no_issues.py
+          cd /review
+          /hyperstyle/bin/python -m hyperstyle.src.python.review.run_tool test/resources/inspectors/python/case39_no_issues.py
 
       - name: Check installed module can run java linters
         run: |
-          review test/resources/inspectors/java/test_algorithm_with_scanner.java
+          cd /review
+          /hyperstyle/bin/python -m hyperstyle.src.python.review.run_tool test/resources/inspectors/java/test_algorithm_with_scanner.java
 
       - name: Check installed module can run js linters
         run: |
-          review test/resources/inspectors/js/case0_no_issues.js
-
-      - name: Test with pytest
-        run: |
-          pytest -vv
+          cd /review
+          /hyperstyle/bin/python -m hyperstyle.src.python.review.run_tool test/resources/inspectors/js/case0_no_issues.js

.github/workflows/build_base_image.yml

@@ -7,7 +7,7 @@ on:
         type: string
         description: 'Image tag'
         required: true
-        default: 'py3.12.5-java11.0.11-node14.17.3-go1.18.5'
+        default: 'py3.10.14-java11.0.11-node14.17.3-go1.18.5'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/build_image.yml

@@ -0,0 +1,43 @@
+name: Build Image after Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: 'Image tag'
+        required: true
+        default: 'latest'
+  release:
+    types:
+      - released
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  build_image:
+    name: Build Image
+    runs-on: [ self-hosted, small ]
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/login-action@v3
+        with:
+          registry: hyperskill.azurecr.io
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build and push server image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          pull: true
+          push: true
+          tags: hyperskill.azurecr.io/hyperstyle:${{ inputs.image_tag || github.event.release.tag_name }}
+          cache-from: |
+            type=gha
+            type=gha,scope=main
+          cache-to: type=gha,mode=max

.github/workflows/publish.yml

@@ -1,19 +1,23 @@
-# Publish to PyPI in case of releasing
+name: Publish to PyPI in case of releasing
 
 on:
   push:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI
-    runs-on: ubuntu-latest
+    runs-on: [ self-hosted, small ]
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version-file: .python-version
       - name: Install pypa/build
         run: |
           python -m pip install build --user
@@ -24,4 +28,4 @@ jobs:
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@master
         with:
-          password: ${{ secrets.SECRETS_TEST_PYPI_API_TOKEN }}
+          password: ${{ secrets.SECRETS_TEST_PYPI_API_TOKEN }}

.github/workflows/sort_whitespaces.yml

@@ -0,0 +1,39 @@
+name: Sort whitespaces
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+    paths:
+      - 'whitelist.txt'
+      - 'hyperstyle/src/python/review/inspectors/flake8/whitelist.txt'
+  pull_request:
+    paths:
+      - 'whitelist.txt'
+      - 'hyperstyle/src/python/review/inspectors/flake8/whitelist.txt'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  sort_whitespaces:
+    name: Sort whitespaces
+    runs-on: [ self-hosted, small ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Sort whitelists
+        run: |
+          for file in "whitelist.txt" "hyperstyle/src/python/review/inspectors/flake8/whitelist.txt"
+          do
+          LC_ALL=C sort $file -o $file
+          done
+
+      - name: Commit sorted whitelists
+        uses: EndBug/add-and-commit@v7.2.1
+        with:
+          add: "['whitelist.txt', 'hyperstyle/src/python/review/inspectors/flake8/whitelist.txt']"
+          message: 'Sort whitelists (Github Actions)'

.gitignore

@@ -77,9 +77,11 @@ __pycache__/
 /.intellij_inspector/out/
 
 lightweight.Dockerfile
+linters
 
 node_modules
 .eslintrc.js
 package-lock.json
 
 hyperstyle/src/python/review/inspectors/common/inspector/proto/model_pb2*
+.env

.python-version

@@ -0,0 +1 @@
+3.10.14