@@ -2,9 +2,9 @@ name: Quibble and Phan
22
33on :
44 push :
5- branches : [ master ]
5+ branches : [ main ]
66 pull_request :
7- branches : [ master ]
7+ branches : [ main ]
88
99jobs :
1010 test :
@@ -13,17 +13,17 @@ jobs:
1313 strategy :
1414 matrix :
1515 include :
16- # Latest stable MediaWiki - PHP 7.4 (phan)
17- - mw : ' REL1_39 '
18- php : 7.4
19- php-docker : 74
16+ # Latest stable MediaWiki - PHP 8.1 (phan)
17+ - mw : ' REL1_43 '
18+ php : 8.1
19+ php-docker : 81
2020 experimental : false
2121 stage : phan
2222
23- # Latest MediaWiki master - PHP 7.4 (phan)
23+ # Latest MediaWiki master - PHP 8.1 (phan)
2424 - mw : ' master'
25- php : 7.4
26- php-docker : 74
25+ php : 8.1
26+ php-docker : 81
2727 experimental : true
2828 stage : phan
2929
@@ -34,80 +34,38 @@ jobs:
3434 experimental : false
3535 stage : coverage
3636
37- # Latest stable MediaWiki - PHP 7.4 (phpunit-unit)
38- - mw : ' REL1_39'
39- php : 7.4
40- php-docker : 74
41- experimental : false
42- stage : phpunit-unit
43-
44- # Latest MediaWiki master - PHP 7.4 (phpunit-unit)
45- - mw : ' master'
46- php : 7.4
47- php-docker : 74
48- experimental : false
49- stage : phpunit-unit
50-
51- # Latest stable MediaWiki - PHP 7.4 (phpunit)
52- - mw : ' REL1_39'
53- php : 7.4
54- php-docker : 74
37+ # Latest stable MediaWiki - PHP 8.1 (phpunit)
38+ - mw : ' REL1_43'
39+ php : 8.1
40+ php-docker : 81
5541 experimental : false
5642 stage : phpunit
5743
58- # Latest MediaWiki master - PHP 7.4 (phpunit)
59- - mw : ' master'
60- php : 7.4
61- php-docker : 74
62- experimental : true
63- stage : phpunit
64-
6544 # Latest MediaWiki master - PHP 8.1 (phpunit)
6645 - mw : ' master'
6746 php : 8.1
6847 php-docker : 81
69- experimental : false
48+ experimental : true
7049 stage : phpunit
7150
72- # Latest stable MediaWiki - PHP 7.4 (selenium)
73- - mw : ' REL1_39'
74- php : 7.4
75- php-docker : 74
76- experimental : false
77- stage : selenium
78-
79- # Latest MediaWiki master - PHP 7.4 (selenium)
51+ # Latest MediaWiki master - PHP 8.1 (selenium)
8052 - mw : ' master'
81- php : 7.4
82- php-docker : 74
83- experimental : false
53+ php : 8.1
54+ php-docker : 81
55+ experimental : true
8456 stage : selenium
8557
86- # Latest stable MediaWiki - PHP 7.4 (qunit)
87- - mw : ' REL1_39'
88- php : 7.4
89- php-docker : 74
90- experimental : false
91- stage : qunit
92-
93- # Latest MediaWiki master - PHP 7.4 (qunit)
58+ # Latest MediaWiki master - PHP 8.1 (qunit)
9459 - mw : ' master'
95- php : 7.4
96- php-docker : 74
97- experimental : false
60+ php : 8.1
61+ php-docker : 81
62+ experimental : true
9863 stage : qunit
9964
100- # Latest stable MediaWiki - PHP 7.4 (npm-test)
101- - mw : ' REL1_39'
102- php : 7.4
103- php-docker : 74
104- experimental : false
105- stage : npm-test
106-
107- # Latest stable MediaWiki - PHP 7.4 (composer-test)
108- - mw : ' REL1_39'
109- php : 7.4
110- php-docker : 74
65+ # Latest stable MediaWiki - PHP 8.1 (composer-test)
66+ - mw : ' REL1_43'
67+ php : 8.1
68+ php-docker : 81
11169 experimental : false
11270 stage : composer-test
11371
@@ -119,14 +77,15 @@ jobs:
11977 QUIBBLE_DOCKER_IMAGE : quibble-buster-php${{ matrix.php-docker }}
12078 COVERAGE_DOCKER_IMAGE : quibble-buster-php${{ matrix.php-docker }}-coverage
12179 PHAN_DOCKER_IMAGE : mediawiki-phan-php${{ matrix.php-docker }}
80+ MEDIAWIKI_VERSION : ${{ matrix.mw }}
12281
12382 steps :
12483 - name : Cancel Previous Runs
125- uses : styfle/cancel-workflow-action@0.11.0
84+ uses : styfle/cancel-workflow-action@0.12.1
12685 with :
12786 access_token : ${{ github.token }}
12887
129- - uses : actions/checkout@v3
88+ - uses : actions/checkout@v4
13089
13190 # /home/runner/cache/ Cache
13291 # /home/runner/src/ Mediawiki installation
13695 # $GITHUB_WORKSPACE/.github/workflows/globals.php Add global configuration options for MediaWiki
13796 - name : Set up
13897 run : |
139- echo MEDIAWIKI_VERSION="${{ matrix.mw }}" >> $GITHUB_ENV
140-
14198 if [ "${{ matrix.stage }}" == 'phan' ]; then
14299 export DOCKER_IMAGE="${PHAN_DOCKER_IMAGE}"
143100 elif [ "${{ matrix.stage }}" == coverage ]; then
@@ -161,13 +118,17 @@ jobs:
161118 # Resolve dependencies
162119 if [ -e .github/workflows/dependencies ]; then
163120 cd .github/workflows
121+ curl -sL https://raw.githubusercontent.com/wikimedia/integration-config/master/zuul/dependencies.yaml -o dependencies.yaml
122+ curl -sL https://raw.githubusercontent.com/wikimedia/integration-config/master/zuul/phan_dependencies.yaml -o phan_dependencies.yaml
164123 curl -sL https://raw.githubusercontent.com/wikimedia/integration-config/master/zuul/parameter_functions.py -o pf.py
165- curl -sL https://raw.githubusercontent.com/Universal-Omega/scripts/master/mediawiki/resolve_dependencies.py -o rd.py
166- echo "DEPENDENCIES=$(python3 rd.py)" >> $GITHUB_ENV
124+ curl -sL https://raw.githubusercontent.com/miraheze/ci-scripts/main/mediawiki/resolve_dependencies.py -o rd.py
125+ if [ -e dependencies ]; then
126+ echo "DEPENDENCIES=$(python3 rd.py dependencies)" >> $GITHUB_ENV
127+ fi
167128 fi
168129
169130 - name : Cache docker image
170- uses : actions/cache@v3.3.1
131+ uses : actions/cache@v4
171132 with :
172133 path : /home/runner/docker-images/${{ env.DOCKER_IMAGE }}
173134 key : ${{ env.DOCKER_IMAGE }}:${{ env.DOCKER_LATEST_TAG }}
@@ -179,7 +140,7 @@ jobs:
179140
180141 - name : Cache quibble docker image
181142 if : ${{ matrix.stage == 'coverage' || matrix.stage == 'phan' }}
182- uses : actions/cache@v3.3.1
143+ uses : actions/cache@v4
183144 with :
184145 path : /home/runner/docker-images/${{ env.QUIBBLE_DOCKER_IMAGE }}
185146 key : ${{ env.QUIBBLE_DOCKER_IMAGE }}:${{ env.QUIBBLE_DOCKER_LATEST_TAG }}
@@ -215,10 +176,10 @@ jobs:
215176 git -C src/ log -n 1 --format="%H"
216177
217178 - name : Cache dependencies (composer and npm)
218- uses : actions/cache@v3.3.1
179+ uses : actions/cache@v4
219180 with :
220181 path : /home/runner/cache
221- key : ${{ runner.os }}-${{ env.MEDIAWIKI_VERSION }}-${{ hashFiles('**/*.lock ') }}
182+ key : ${{ runner.os }}-${{ env.MEDIAWIKI_VERSION }}-${{ hashFiles('**/*.json ') }}
222183
223184 - name : Setup PHP Action
224185 if : ${{ matrix.stage == 'phan' }}
@@ -314,7 +275,7 @@ jobs:
314275
315276 - name : Upload coverage to Codecov
316277 if : ${{ matrix.stage == 'coverage' }}
317- uses : codecov/codecov-action@v3
278+ uses : codecov/codecov-action@v5
318279 with :
319280 directory : /home/runner/cover
320281
0 commit comments