Skip to content

Commit 58c7d11

Browse files
bckohanbckohan
authored
Merge pull request #674 from bckohan/ci
move from 6.0 rc1 to 6.0 django in CI
2 parents 617863d + 4fdf413 commit 58c7d11

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
django-version:
3131
- '4.2' # LTS April 2026
3232
- '5.2' # LTS April December 2027
33-
- '6.0rc1' #
33+
- '6.0' #
3434
exclude:
3535
- python-version: '3.12'
3636
django-version: '4.2'
@@ -43,9 +43,9 @@ jobs:
4343
django-version: '5.2'
4444

4545
- python-version: '3.10'
46-
django-version: '6.0rc1'
46+
django-version: '6.0'
4747
- python-version: '3.12'
48-
django-version: '6.0rc1'
48+
django-version: '6.0'
4949

5050
env:
5151
TEST_PYTHON_VERSION: ${{ matrix.python-version }}

‎.github/workflows/test.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
- '4.2' # LTS April 2026
4141
- '5.1' # December 2025
4242
- '5.2' # LTS April 2028
43-
- '6.0rc1' #
43+
- '6.0' #
4444
exclude:
4545

4646
- python-version: '3.10'
47-
django-version: '6.0rc1'
47+
django-version: '6.0'
4848
- python-version: '3.11'
49-
django-version: '6.0rc1'
49+
django-version: '6.0'
5050

5151
- python-version: '3.13'
5252
django-version: '4.2'
@@ -63,14 +63,14 @@ jobs:
6363
- postgres-version: '12'
6464
django-version: '5.2'
6565
- postgres-version: '12'
66-
django-version: '6.0rc1'
66+
django-version: '6.0'
6767

6868
- postgres-version: '14'
6969
django-version: '4.2'
7070
- postgres-version: '14'
7171
django-version: '5.2'
7272
- postgres-version: '14'
73-
django-version: '6.0rc1'
73+
django-version: '6.0'
7474

7575
- postgres-version: 'latest'
7676
django-version: '4.2'
@@ -183,17 +183,17 @@ jobs:
183183
django-version:
184184
- '4.2' # LTS April 2026
185185
- '5.2' # LTS April 2028
186-
- '6.0rc1' # LTS April 2028
186+
- '6.0' # LTS April 2028
187187
exclude:
188188
- python-version: '3.10'
189189
django-version: '5.2'
190190
- python-version: '3.10'
191-
django-version: '6.0rc1'
191+
django-version: '6.0'
192192

193193
- python-version: '3.12'
194194
django-version: '4.2'
195195
- python-version: '3.12'
196-
django-version: '6.0rc1'
196+
django-version: '6.0'
197197

198198
- python-version: '3.14'
199199
django-version: '4.2'
@@ -256,12 +256,12 @@ jobs:
256256
django-version:
257257
- '4.2' # LTS April 2024
258258
- '5.2' # LTS April 2028
259-
- '6.0rc1' # April 2027
259+
- '6.0' # April 2027
260260
exclude:
261261
- django-version: '4.2'
262262
mysql-version: 'latest'
263263

264-
- django-version: '6.0rc1'
264+
- django-version: '6.0'
265265
mysql-version: '8.0'
266266

267267
- mysql-version: 'latest'
@@ -280,9 +280,9 @@ jobs:
280280
mysqlclient-version: '1.4.3'
281281

282282
- python-version: '3.10'
283-
django-version: '6.0rc1'
283+
django-version: '6.0'
284284
- python-version: '3.12'
285-
django-version: '6.0rc1'
285+
django-version: '6.0'
286286

287287
env:
288288
RDBMS: mysql
@@ -378,14 +378,14 @@ jobs:
378378
django-version:
379379
- '4.2' # LTS April 2024
380380
- '5.2' # LTS April 2028
381-
- '6.0rc1' # April 2027
381+
- '6.0' # April 2027
382382
exclude:
383383
- django-version: '4.2'
384384
mariadb-version: 'latest'
385385

386386
- django-version: '5.2'
387387
mariadb-version: '10.4'
388-
- django-version: '6.0rc1'
388+
- django-version: '6.0'
389389
mariadb-version: '10.4'
390390

391391
- mariadb-version: 'latest'
@@ -404,9 +404,9 @@ jobs:
404404
mysqlclient-version: '1.4.3'
405405

406406
- python-version: '3.10'
407-
django-version: '6.0rc1'
407+
django-version: '6.0'
408408
- python-version: '3.12'
409-
django-version: '6.0rc1'
409+
django-version: '6.0'
410410

411411
- mariadb-version: '10.4'
412412
mysqlclient-version: ''
@@ -496,7 +496,7 @@ jobs:
496496
django-version:
497497
- '4.2' # LTS April 2026
498498
- '5.2' # LTS April 2028
499-
- '6.0rc1' # LTS April 2028
499+
- '6.0' # LTS April 2028
500500
oracle-version:
501501
- 'oracle-xe:21'
502502
- 'oracle-free:latest'
@@ -508,18 +508,18 @@ jobs:
508508
- django-version: '5.2'
509509
oracle-version: 'oracle-free:latest'
510510

511-
- django-version: '6.0rc1'
511+
- django-version: '6.0'
512512
oracle-version: 'oracle-xe:21'
513513

514514
- python-version: '3.10'
515515
django-version: '5.2'
516516
- python-version: '3.10'
517-
django-version: '6.0rc1'
517+
django-version: '6.0'
518518

519519
- python-version: '3.12'
520520
django-version: '4.2'
521521
- python-version: '3.12'
522-
django-version: '6.0rc1'
522+
django-version: '6.0'
523523

524524
- python-version: '3.14'
525525
django-version: '4.2'
@@ -640,17 +640,17 @@ jobs:
640640
django-version:
641641
- '4.2' # LTS April 2026
642642
- '5.2' # LTS April 2028
643-
- '6.0rc1' # LTS April 2028
643+
- '6.0' # LTS April 2028
644644
exclude:
645645
- python-version: '3.10'
646646
django-version: '5.2'
647647
- python-version: '3.10'
648-
django-version: '6.0rc1'
648+
django-version: '6.0'
649649

650650
- python-version: '3.12'
651651
django-version: '4.2'
652652
- python-version: '3.12'
653-
django-version: '6.0rc1'
653+
django-version: '6.0'
654654

655655
- python-version: '3.14'
656656
django-version: '4.2'
@@ -717,17 +717,17 @@ jobs:
717717
django-version:
718718
- '4.2' # LTS April 2026
719719
- '5.2' # LTS April 2028
720-
- '6.0rc1' # LTS April 2028
720+
- '6.0' # LTS April 2028
721721
exclude:
722722
- python-version: '3.10'
723723
django-version: '5.2'
724724
- python-version: '3.10'
725-
django-version: '6.0rc1'
725+
django-version: '6.0'
726726

727727
- python-version: '3.12'
728728
django-version: '4.2'
729729
- python-version: '3.12'
730-
django-version: '6.0rc1'
730+
django-version: '6.0'
731731

732732
- python-version: '3.14'
733733
django-version: '4.2'

0 commit comments

Comments
 (0)