Skip to content

Commit 820b198

Browse files
Merge branch 'master' into SSL/TLS_MODULES
2 parents 79cb195 + 6bd1aae commit 820b198

File tree

4 files changed

+71
-53
lines changed

4 files changed

+71
-53
lines changed

.github/workflows/ci_cd.yml

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,60 @@ on:
55
- push
66
- workflow_dispatch
77

8+
concurrency:
9+
cancel-in-progress: true
10+
group: ${{ github.repository }}-${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
11+
812
jobs:
13+
pre-commit:
14+
name: Run pre-commit
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check out repository
18+
uses: actions/checkout@v4
19+
20+
- name: Set up Python
21+
uses: actions/setup-python@v5
22+
with:
23+
python-version: '3.11'
24+
- name: Run pre-commit
25+
uses: pre-commit/[email protected]
26+
27+
code-ql:
28+
name: CodeQL
29+
needs:
30+
- pre-commit
31+
permissions:
32+
security-events: write
33+
runs-on: ubuntu-latest
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
language:
38+
- javascript
39+
- python
40+
steps:
41+
- name: Check out repository
42+
uses: actions/checkout@v4
43+
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v3
46+
with:
47+
languages: ${{ matrix.language }}
48+
49+
- name: Perform CodeQL Analysis
50+
uses: github/codeql-action/analyze@v3
51+
with:
52+
category: /language:${{ matrix.language }}
53+
954
run-tests:
1055
name: Run tests
56+
needs:
57+
- pre-commit
1158
runs-on: ubuntu-latest
1259
steps:
13-
- uses: actions/checkout@v4
60+
- name: Check out repository
61+
uses: actions/checkout@v4
1462

1563
- name: Set up Python
1664
uses: actions/setup-python@v5
@@ -28,11 +76,12 @@ jobs:
2876
2977
build-package:
3078
name: Build package
31-
needs:
79+
needs:
3280
- run-tests
3381
runs-on: ubuntu-latest
3482
steps:
35-
- uses: actions/checkout@v4
83+
- name: Check out repository
84+
uses: actions/checkout@v4
3685

3786
- name: Set up Python
3887
uses: actions/setup-python@v5
@@ -57,11 +106,11 @@ jobs:
57106

58107
test-docker-image:
59108
name: Test Docker image
60-
needs:
109+
needs:
61110
- run-tests
62111
runs-on: ubuntu-latest
63112
steps:
64-
- name: Check out the repo
113+
- name: Check out repository
65114
uses: actions/checkout@v4
66115

67116
- name: Build Docker image
@@ -121,7 +170,7 @@ jobs:
121170
- test-docker-image
122171
runs-on: ubuntu-latest
123172
steps:
124-
- name: Checkout
173+
- name: Check out repository
125174
uses: actions/checkout@v4
126175

127176
- name: Login to Docker Hub
@@ -151,7 +200,7 @@ jobs:
151200
- test-docker-image
152201
runs-on: ubuntu-latest
153202
steps:
154-
- name: Checkout
203+
- name: Check out repository
155204
uses: actions/checkout@v4
156205

157206
- name: Set up QEMU

.github/workflows/codeql.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

poetry.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ ruff = "^0.2.1"
6868

6969
[tool.poetry.group.test.dependencies]
7070
coverage = "^7.3.2"
71-
pytest = "^7.4.3"
72-
pytest-cov = "^4.1.0"
71+
pytest = ">=7.4.3,<9.0.0"
72+
pytest-cov = ">=4.1,<6.0"
7373
pytest-xdist = "^3.3.1"
7474

7575
[tool.poetry.urls]

0 commit comments

Comments
 (0)