@@ -8,8 +8,11 @@ on: # yamllint disable-line rule:truthy rule:comments
88 branches :
99 - " main"
1010 - " develop"
11+ <<<<<<< HEAD
1112 tags :
1213 - " v*"
14+ =======
15+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
1316 pull_request : ~
1417
1518env :
1821
1922jobs :
2023 ruff-format :
24+ <<<<<<< HEAD
2125 runs-on : " ubuntu-24.04"
26+ =======
27+ runs-on : " ubuntu-latest"
28+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
2229 env :
2330 INVOKE_PYNTC_LOCAL : " True"
2431 steps :
@@ -27,11 +34,19 @@ jobs:
2734 - name : " Setup environment"
2835 uses : " networktocode/gh-action-setup-poetry-environment@v6"
2936 with :
37+ <<<<<<< HEAD
3038 poetry-version : " 1.8.5"
3139 - name : " Linting: ruff format"
3240 run : " poetry run invoke ruff --action format"
3341 ruff-lint :
3442 runs-on : " ubuntu-24.04"
43+ =======
44+ poetry-version : " 2.1.3"
45+ - name : " Linting: ruff format"
46+ run : " poetry run invoke ruff --action format"
47+ ruff-lint :
48+ runs-on : " ubuntu-latest"
49+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
3550 env :
3651 INVOKE_PYNTC_LOCAL : " True"
3752 steps :
4055 - name : " Setup environment"
4156 uses : " networktocode/gh-action-setup-poetry-environment@v6"
4257 with :
58+ <<<<<<< HEAD
4359 poetry-version : " 1.8.5"
4460 - name : " Linting: ruff"
4561 run : " poetry run invoke ruff --action lint"
5975 # run: "poetry run invoke build-and-check-docs"
6076 poetry :
6177 runs-on : " ubuntu-24.04"
78+ =======
79+ poetry-version : " 2.1.3"
80+ - name : " Linting: ruff"
81+ run : " poetry run invoke ruff --action lint"
82+ check-docs-build :
83+ runs-on : " ubuntu-latest"
84+ env :
85+ INVOKE_PYNTC_LOCAL : " True"
86+ steps :
87+ - name : " Check out repository code"
88+ uses : " actions/checkout@v4"
89+ - name : " Setup environment"
90+ uses : " networktocode/gh-action-setup-poetry-environment@v6"
91+ with :
92+ poetry-version : " 2.1.3"
93+ poetry-install-options : " --only dev,docs"
94+ - name : " Check Docs Build"
95+ run : " poetry run invoke build-and-check-docs"
96+ poetry :
97+ runs-on : " ubuntu-latest"
98+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
6299 env :
63100 INVOKE_PYNTC_LOCAL : " True"
64101 steps :
67104 - name : " Setup environment"
68105 uses : " networktocode/gh-action-setup-poetry-environment@v6"
69106 with :
107+ <<<<<<< HEAD
70108 poetry-version : " 1.8.5"
71109 - name : " Checking: poetry lock file"
72110 run : " poetry lock --check"
@@ -76,6 +114,13 @@ jobs:
76114 - " yamllint"
77115 yamllint :
78116 runs-on : " ubuntu-24.04"
117+ =======
118+ poetry-version : " 2.1.3"
119+ - name : " Checking: poetry lock file"
120+ run : " poetry run invoke lock --check"
121+ yamllint :
122+ runs-on : " ubuntu-latest"
123+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
79124 env :
80125 INVOKE_PYNTC_LOCAL : " True"
81126 steps :
84129 - name : " Setup environment"
85130 uses : " networktocode/gh-action-setup-poetry-environment@v6"
86131 with :
132+ <<<<<<< HEAD
87133 poetry-version : " 1.8.5"
88134 - name : " Linting: yamllint"
89135 run : " poetry run invoke yamllint"
@@ -98,13 +144,38 @@ jobs:
98144 python-version : ["3.9", "3.10", "3.11", "3.12"]
99145 env :
100146 PYTHON_VER : " ${{ matrix.python-version }}"
147+ =======
148+ poetry-version : " 2.1.3"
149+ - name : " Linting: yamllint"
150+ run : " poetry run invoke yamllint"
151+ check-in-docker :
152+ needs :
153+ - " ruff-format"
154+ - " ruff-lint"
155+ - " poetry"
156+ - " yamllint"
157+ runs-on : " ubuntu-latest"
158+ strategy :
159+ fail-fast : true
160+ matrix :
161+ python-version : ["3.10", "3.13"]
162+ env :
163+ INVOKE_PYNTC_PYTHON_VER : " ${{ matrix.python-version }}"
164+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
101165 steps :
102166 - name : " Check out repository code"
103167 uses : " actions/checkout@v4"
104168 - name : " Setup environment"
105169 uses : " networktocode/gh-action-setup-poetry-environment@v6"
170+ <<<<<<< HEAD
106171 - name : " Get image version"
107172 run : " echo INVOKE_PYNTC_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
173+ =======
174+ with :
175+ poetry-version : " 2.1.3"
176+ - name : " Get image version"
177+ run : " echo INVOKE_PYNTC_IMAGE_VER=`poetry version -s`-py$${{ matrix.python-version }} >> $GITHUB_ENV"
178+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
108179 - name : " Set up Docker Buildx"
109180 id : " buildx"
110181 uses : " docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
@@ -121,6 +192,7 @@ jobs:
121192 cache-to : " type=gha,scope=${{ env.INVOKE_PYNTC_IMAGE_NAME }}-${{ env.INVOKE_PYNTC_IMAGE_VER }}-py${{ matrix.python-version }}"
122193 build-args : |
123194 PYTHON_VER=${{ env.PYTHON_VER }}
195+ <<<<<<< HEAD
124196 - name : " Debug: Show docker images"
125197 run : " docker image ls"
126198 - name : " Linting: Pylint"
@@ -135,11 +207,30 @@ jobs:
135207 runs-on : " ubuntu-24.04"
136208 env :
137209 PYTHON_VER : " ${{ matrix.python-version }}"
210+ =======
211+ - name : " Linting: Pylint"
212+ run : " poetry run invoke pylint"
213+ pytest :
214+ needs :
215+ - " check-in-docker"
216+ strategy :
217+ fail-fast : true
218+ matrix :
219+ python-version : ["3.10", "3.11", "3.12", "3.13"]
220+ runs-on : " ubuntu-latest"
221+ env :
222+ INVOKE_PYNTC_PYTHON_VER : " ${{ matrix.python-version }}"
223+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
138224 steps :
139225 - name : " Check out repository code"
140226 uses : " actions/checkout@v4"
141227 - name : " Setup environment"
142228 uses : " networktocode/gh-action-setup-poetry-environment@v6"
229+ <<<<<<< HEAD
230+ =======
231+ with :
232+ poetry-version : " 2.1.3"
233+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
143234 - name : " Get image version"
144235 run : " echo INVOKE_PYNTC_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
145236 - name : " Set up Docker Buildx"
@@ -158,6 +249,7 @@ jobs:
158249 cache-to : " type=gha,scope=${{ env.INVOKE_PYNTC_IMAGE_NAME }}-${{ env.INVOKE_PYNTC_IMAGE_VER }}-py${{ matrix.python-version }}"
159250 build-args : |
160251 PYTHON_VER=${{ env.PYTHON_VER }}
252+ <<<<<<< HEAD
161253 - name : " Debug: Show docker images"
162254 run : " docker image ls"
163255 - name : " Run Tests"
@@ -254,3 +346,25 @@ jobs:
254346 env :
255347 SLACK_WEBHOOK_URL : " ${{ secrets.SLACK_WEBHOOK_URL }}"
256348 SLACK_WEBHOOK_TYPE : " INCOMING_WEBHOOK"
349+ =======
350+ - name : " Run Tests"
351+ run : " poetry run invoke pytest"
352+ changelog :
353+ if : >
354+ contains(fromJson('["develop"]'), github.base_ref) &&
355+ (github.head_ref != 'main') && (!startsWith(github.head_ref, 'release'))
356+ runs-on : " ubuntu-latest"
357+ steps :
358+ - name : " Check out repository code"
359+ uses : " actions/checkout@v4"
360+ with :
361+ fetch-depth : " 0"
362+ - name : " Setup environment"
363+ uses : " networktocode/gh-action-setup-poetry-environment@v6"
364+ with :
365+ poetry-version : " 2.1.3"
366+ - name : " Check for changelog entry"
367+ run : |
368+ git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
369+ poetry run towncrier check --compare-with origin/${{ github.base_ref }}
370+ >>>>>>> 2122990 (Cookie initially baked targeting develop by NetworkToCode Cookie Drift Manager Tool)
0 commit comments