Skip to content

Commit

Permalink
Merge pull request #174 from plone/4.x-update-ci
Browse files Browse the repository at this point in the history
test with Plone 6.0.13
  • Loading branch information
davisagli authored Dec 17, 2024
2 parents 4a7593b + 96d8a6d commit f1d47d8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ jobs:
strategy:
fail-fast: false
matrix:
python: [3.7, 3.8, 3.9, "3.10", "3.11"]
plone: ["6.0.6", "5.2.10"]
python: [3.8, 3.9, "3.10", "3.11"]
plone: ["6.0.13", "5.2.15"]
exclude:
- plone: "6.0.6"
python: 3.7
- plone: "5.2.10"
- plone: "5.2.15"
python: 3.9
- plone: "5.2.10"
- plone: "5.2.15"
python: "3.10"
- plone: "5.2.10"
- plone: "5.2.15"
python: "3.11"

steps:
Expand All @@ -24,7 +22,7 @@ jobs:

- name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}
id: setup
uses: plone/setup-plone@v1.0.0
uses: plone/setup-plone@v3.0.0
with:
python-version: ${{ matrix.python }}
plone-version: ${{ matrix.plone }}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`
YELLOW=`tput setaf 3`

PLONE5=5.2.10
PLONE6=6.0.6
PLONE5=5.2.15
PLONE6=6.0.13

CODE_QUALITY_VERSION=1.0.1
LINT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check
Expand Down
2 changes: 1 addition & 1 deletion plone-5.2.x.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[buildout]
extends =
base.cfg
http://dist.plone.org/release/5.2.10/versions.cfg
http://dist.plone.org/release/5.2.15/versions.cfg
find-links += http://dist.plone.org/thirdparty/

[versions]
Expand Down
2 changes: 1 addition & 1 deletion plone-6.0.x.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[buildout]
extends =
https://dist.plone.org/release/6.0.6/versions.cfg
https://dist.plone.org/release/6.0.13/versions.cfg
base.cfg

[instance]
Expand Down

0 comments on commit f1d47d8

Please sign in to comment.