Skip to content

Commit 570363f

Browse files
authored
Merge pull request #59 from collective/3.x-fix-gha
[3.x] Fix GHA on Plone 5.2
2 parents f7565a6 + 524d623 commit 570363f

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.gha.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ extends = plone-x.x.x.cfg
55
recipe = plone.recipe.codeanalysis
66
pre-commit-hook = False
77
return-status-codes = True
8+
9+
[versions]
10+
# Use the versions from the requirements files
11+
setuptools =
12+
zc.buildout =

.github/workflows/tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@ jobs:
1515
strategy:
1616
matrix:
1717
config:
18-
- ["Py2.7-Plone5.1", "2.7", "5.1"]
19-
- ["Py2.7-Plone5.2", "2.7", "5.2"]
20-
- ["Py3.6-Plone5.2", "3.6", "5.2"]
21-
- ["Py3.7-Plone5.2", "3.7", "5.2"]
2218
- ["Py3.8-Plone5.2", "3.8", "5.2"]
2319
steps:
24-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v5
2521
- name: Set up Python ${{ matrix.config[1] }}
26-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v6
2723
with:
2824
python-version: ${{ matrix.config[1] }}
2925
- name: Pip cache
30-
uses: actions/cache@v2
26+
uses: actions/cache@v4
3127
with:
3228
path: |
3329
~/.cache/pip
@@ -44,10 +40,14 @@ jobs:
4440
echo "[buildout]" > $HOME/.buildout/default.cfg
4541
echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
4642
echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
47-
wget https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
48-
mkdir geckodriver && tar zxvf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver
49-
python -m pip install --upgrade pip
43+
echo "abi-tag-eggs = true" >> $HOME/.buildout/default.cfg
44+
45+
- name: Install requirements and buildout
46+
run: |
5047
pip install -r requirements.txt
48+
49+
- name: Run buildout
50+
run: |
5151
sed -ie "s#plone-x.x.x.cfg#plone-${{ matrix.config[2] }}.x.cfg#" .gha.cfg
5252
buildout -c .gha.cfg
5353
- name: Test

plone-5.2.x.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[buildout]
22
extends =
33
base.cfg
4-
https://dist.plone.org/release/5.2.3/versions.cfg
4+
https://dist.plone.org/release/5.2.15/versions.cfg
55
find-links += https://dist.plone.org/thirdparty/
66
versions=versions
77
show-picked-versions = true

requirements.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Keep this file in sync with: https://github.com/kitconcept/buildout/edit/master/requirements.txt
2-
setuptools==42.0.2
3-
zc.buildout==2.13.3
4-
wheel
1+
setuptools==75.3.0
2+
wheel==0.45.1
3+
zc.buildout==3.4

0 commit comments

Comments
 (0)