Skip to content

Commit bf1714c

Browse files
authored
[qa] Run QA checks in main build
1 parent 542c17e commit bf1714c

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/branch.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ jobs:
1919
sudo pip install -U pip setuptools wheel
2020
sudo pip install -r requirements-test.txt
2121
22-
- name: Lint
23-
run: openwisp-qa-check --skip-checkmigrations
22+
- name: Install Testing Requirements
23+
run: |
24+
sudo pip install -r requirements-test.txt
25+
sudo curl -sL -o /bin/hadolint "https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64"
26+
sudo chmod +x /bin/hadolint
27+
28+
- name: QA checks
29+
run: ./run-qa-checks
2430

2531
- name: Setup
2632
run: |

.github/workflows/pull_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install Testing Requirements
2020
run: |
2121
sudo pip install -r requirements-test.txt
22-
sudo curl -sL -o /bin/hadolint "https://github.com/hadolint/hadolint/releases/download/v1.16.3/hadolint-Linux-x86_64"
22+
sudo curl -sL -o /bin/hadolint "https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64"
2323
sudo chmod +x /bin/hadolint
2424
2525
- name: QA checks

images/openwisp_base/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ ARG DJANGO_SOURCE=django~=4.2.0
8181
RUN pip install --no-cache-dir --user --upgrade ${DJANGO_SOURCE}
8282

8383
COPY ./openwisp_base/requirements.txt /tmp/openwisp-deploy-requirements.txt
84-
RUN pip install --no-cache-dir --user --upgrade -r /tmp/openwisp-deploy-requirements.txt
85-
RUN pip install --upgrade urllib3~=2.2.1
84+
RUN pip install --no-cache-dir --user --upgrade -r /tmp/openwisp-deploy-requirements.txt && \
85+
pip install --no-cache-dir --upgrade urllib3~=2.2.1
8686

8787
FROM system
8888

0 commit comments

Comments
 (0)