[qa] Run QA checks in main build

openwisp · May 22, 2024 · bf1714c · bf1714c
1 parent 542c17e
commit bf1714c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -19,8 +19,14 @@ jobs:
           sudo pip install -U pip setuptools wheel
           sudo pip install -r requirements-test.txt
 
-      - name: Lint
-        run: openwisp-qa-check --skip-checkmigrations
+      - name: Install Testing Requirements
+        run: |
+          sudo pip install -r requirements-test.txt
+          sudo curl -sL -o /bin/hadolint "https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64"
+          sudo chmod +x /bin/hadolint
+
+      - name: QA checks
+        run: ./run-qa-checks
 
       - name: Setup
         run: |

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install Testing Requirements
         run: |
           sudo pip install -r requirements-test.txt
-          sudo curl -sL -o /bin/hadolint "https://github.com/hadolint/hadolint/releases/download/v1.16.3/hadolint-Linux-x86_64"
+          sudo curl -sL -o /bin/hadolint "https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64"
           sudo chmod +x /bin/hadolint
 
       - name: QA checks

diff --git a/images/openwisp_base/Dockerfile b/images/openwisp_base/Dockerfile
@@ -81,8 +81,8 @@ ARG DJANGO_SOURCE=django~=4.2.0
 RUN pip install --no-cache-dir --user --upgrade ${DJANGO_SOURCE}
 
 COPY ./openwisp_base/requirements.txt /tmp/openwisp-deploy-requirements.txt
-RUN pip install --no-cache-dir --user --upgrade -r /tmp/openwisp-deploy-requirements.txt
-RUN pip install --upgrade urllib3~=2.2.1
+RUN pip install --no-cache-dir --user --upgrade -r /tmp/openwisp-deploy-requirements.txt && \
+    pip install --no-cache-dir --upgrade urllib3~=2.2.1
 
 FROM system