Skip to content

Commit 324f538

Browse files
Merge pull request #16 from ghostwriter/feature/renovate
Prepare for Renovate with reusable workflows
2 parents 3e2aa08 + 13e7880 commit 324f538

File tree

4 files changed

+17
-89
lines changed

4 files changed

+17
-89
lines changed

.github/workflows/continuous-integration.yml

+2-24
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,8 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- '[0-9]+.[0-9]+.x'
8-
- 'refs/pull/*'
97
tags:
108

119
jobs:
12-
matrix:
13-
name: Generate job matrix
14-
runs-on: ubuntu-latest
15-
outputs:
16-
matrix: ${{ steps.matrix.outputs.matrix }}
17-
steps:
18-
- name: Gather CI configuration
19-
id: matrix
20-
uses: laminas/laminas-ci-matrix-action@v1
21-
22-
qa:
23-
name: QA Checks
24-
needs: [matrix]
25-
runs-on: ${{ matrix.operatingSystem }}
26-
strategy:
27-
fail-fast: false
28-
matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
29-
steps:
30-
- name: ${{ matrix.name }}
31-
uses: laminas/laminas-continuous-integration-action@v1
32-
with:
33-
job: ${{ matrix.job }}
10+
ci:
11+
uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Alternate workflow example.
2-
# This one is identical to the one in release-on-milestone.yml, with one change:
3-
# the Release step uses the ORGANIZATION_ADMIN_TOKEN instead, to allow it to
4-
# trigger a release workflow event. This is useful if you have other actions
5-
# that intercept that event.
6-
71
name: "Automatic Releases"
82

93
on:
@@ -13,59 +7,9 @@ on:
137

148
jobs:
159
release:
16-
name: "GIT tag, release & create merge-up PR"
17-
runs-on: ubuntu-latest
18-
19-
steps:
20-
- name: "Checkout"
21-
uses: "actions/checkout@v2"
22-
23-
- name: "Release"
24-
uses: "laminas/automatic-releases@v1"
25-
with:
26-
command-name: "laminas:automatic-releases:release"
27-
env:
28-
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
29-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
30-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
31-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
32-
33-
- name: "Create Merge-Up Pull Request"
34-
uses: "laminas/automatic-releases@v1"
35-
with:
36-
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
37-
env:
38-
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
39-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
40-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
41-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
42-
43-
- name: "Create and/or Switch to new Release Branch"
44-
uses: "laminas/automatic-releases@v1"
45-
with:
46-
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
47-
env:
48-
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
49-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
50-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
51-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
52-
53-
- name: "Bump Changelog Version On Originating Release Branch"
54-
uses: "laminas/automatic-releases@v1"
55-
with:
56-
command-name: "laminas:automatic-releases:bump-changelog"
57-
env:
58-
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
59-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
60-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
61-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
62-
63-
- name: "Create new milestones"
64-
uses: "laminas/automatic-releases@v1"
65-
with:
66-
command-name: "laminas:automatic-releases:create-milestones"
67-
env:
68-
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
69-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
70-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
71-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
10+
uses: laminas/workflow-automatic-releases/.github/workflows/[email protected]
11+
secrets:
12+
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
13+
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
14+
ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
15+
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}

composer.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@
1818
"forum": "https://discourse.laminas.dev"
1919
},
2020
"config": {
21-
"sort-packages": true,
2221
"allow-plugins": {
2322
"dealerdirect/phpcodesniffer-composer-installer": true
24-
}
23+
},
24+
"platform": {
25+
"php": "7.4.99"
26+
},
27+
"sort-packages": true
2528
},
2629
"extra": {
2730
"laminas": {

composer.lock

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)