Skip to content

Commit 6b6ac19

Browse files
committed
Upgrade php-versions role.
1 parent e0863ce commit 6b6ac19

File tree

10 files changed

+186
-57
lines changed

10 files changed

+186
-57
lines changed

provisioning/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ roles:
5757
- name: geerlingguy.php-tideways
5858
version: 2.2.0
5959
- name: geerlingguy.php-versions
60-
version: 4.0.4
60+
version: 4.0.5
6161
- name: geerlingguy.php-xdebug
6262
version: 3.0.0
6363
- name: geerlingguy.php-xhprof
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 90
5+
6+
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7+
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8+
daysUntilClose: 30
9+
10+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11+
onlyLabels: []
12+
13+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14+
exemptLabels:
15+
- pinned
16+
- security
17+
- planned
18+
19+
# Set to true to ignore issues in a project (defaults to false)
20+
exemptProjects: false
21+
22+
# Set to true to ignore issues in a milestone (defaults to false)
23+
exemptMilestones: false
24+
25+
# Set to true to ignore issues with an assignee (defaults to false)
26+
exemptAssignees: false
27+
28+
# Label to use when marking as stale
29+
staleLabel: stale
30+
31+
# Limit the number of actions per hour, from 1-30. Default is 30
32+
limitPerRun: 30
33+
34+
pulls:
35+
markComment: |-
36+
This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
37+
38+
Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
39+
40+
unmarkComment: >-
41+
This pull request is no longer marked for closure.
42+
43+
closeComment: >-
44+
This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
45+
46+
issues:
47+
markComment: |-
48+
This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
49+
50+
Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
51+
52+
unmarkComment: >-
53+
This issue is no longer marked for closure.
54+
55+
closeComment: >-
56+
This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
---
2+
name: CI
3+
'on':
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
schedule:
9+
- cron: "30 6 * * 4"
10+
11+
defaults:
12+
run:
13+
working-directory: 'geerlingguy.php-versions'
14+
15+
jobs:
16+
17+
lint:
18+
name: Lint
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Check out the codebase.
22+
uses: actions/checkout@v2
23+
with:
24+
path: 'geerlingguy.php-versions'
25+
26+
- name: Set up Python 3.
27+
uses: actions/setup-python@v2
28+
with:
29+
python-version: '3.x'
30+
31+
- name: Install test dependencies.
32+
run: pip3 install yamllint ansible-lint
33+
34+
- name: Lint code.
35+
run: |
36+
yamllint .
37+
ansible-lint
38+
39+
molecule:
40+
name: Molecule
41+
runs-on: ubuntu-latest
42+
strategy:
43+
matrix:
44+
include:
45+
# Default PHP version (7.3).
46+
- distro: centos8
47+
playbook: converge.yml
48+
- distro: centos7
49+
playbook: converge.yml
50+
- distro: ubuntu1804
51+
playbook: converge.yml
52+
- distro: debian10
53+
playbook: converge.yml
54+
55+
# PHP 7.4.
56+
- distro: centos8
57+
playbook: 7.4.yml
58+
- distro: ubuntu1804
59+
playbook: 7.4.yml
60+
- distro: debian10
61+
playbook: 7.4.yml
62+
63+
# PHP 7.2.
64+
- distro: centos8
65+
playbook: 7.2.yml
66+
- distro: ubuntu1804
67+
playbook: 7.2.yml
68+
69+
steps:
70+
- name: Check out the codebase.
71+
uses: actions/checkout@v2
72+
with:
73+
path: 'geerlingguy.php-versions'
74+
75+
- name: Set up Python 3.
76+
uses: actions/setup-python@v2
77+
with:
78+
python-version: '3.x'
79+
80+
- name: Install test dependencies.
81+
run: pip3 install ansible molecule[docker] docker
82+
83+
- name: Run Molecule tests.
84+
run: molecule test
85+
env:
86+
PY_COLORS: '1'
87+
ANSIBLE_FORCE_COLOR: '1'
88+
MOLECULE_DISTRO: ${{ matrix.distro }}
89+
MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
# This workflow requires a GALAXY_API_KEY secret present in the GitHub
3+
# repository or organization.
4+
#
5+
# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
6+
# See: https://github.com/ansible/galaxy/issues/46
7+
8+
name: Release
9+
'on':
10+
push:
11+
tags:
12+
- '*'
13+
14+
defaults:
15+
run:
16+
working-directory: 'geerlingguy.php-versions'
17+
18+
jobs:
19+
20+
release:
21+
name: Release
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Check out the codebase.
25+
uses: actions/checkout@v2
26+
with:
27+
path: 'geerlingguy.php-versions'
28+
29+
- name: Set up Python 3.
30+
uses: actions/setup-python@v2
31+
with:
32+
python-version: '3.x'
33+
34+
- name: Install Ansible.
35+
run: pip3 install ansible-base
36+
37+
- name: Trigger a new import on Galaxy.
38+
run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

provisioning/roles/geerlingguy.php-versions/.travis.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

provisioning/roles/geerlingguy.php-versions/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Ansible Role: PHP Versions
22

3-
[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-versions.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-versions)
3+
[![CI](https://github.com/geerlingguy/ansible-role-php-versions/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-php-versions/actions?query=workflow%3ACI)
44

55
Allows different PHP versions to be installed when using the `geerlingguy.php` role (or a similar role). This role was originally built for [Drupal VM](https://www.drupalvm.com) but was released more generically so others could use an easier mechanism for switching PHP versions.
66

provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ dependency:
33
name: galaxy
44
driver:
55
name: docker
6-
lint: |
7-
set -e
8-
yamllint .
9-
ansible-lint
106
platforms:
117
- name: instance
128
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"

provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
- name: Enable DNF module for CentOS 8+.
2323
shell: |
24-
dnf config-manager --set-enabled PowerTools
24+
dnf config-manager --set-enabled powertools
2525
dnf module enable -y php:remi-{{ php_version }}
2626
args:
2727
warn: false

0 commit comments

Comments
 (0)