Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest upstream. #66

Merged
merged 1 commit into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Bug report
description: If you've found a problem with the template, let us know so that we can update it for everyone.
labels:
- 'bug'
body:
- type: markdown
attributes:
value: |
Thanks for your interest in helping improve the Platform.sh templates!
Please fill in the fields below so we can understand what's going wrong.

- type: textarea
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is.
placeholder: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend diam non condimentum tincidunt. Vestibulum convallis eget ante dapibus eleifend.
validations:
required: true

- type: textarea
attributes:
label: Include some logs
description: Any logs you can include will help us investigate the issue.
placeholder: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend diam non condimentum tincidunt. Vestibulum convallis eget ante dapibus eleifend.
validations:
required: true

- type: textarea
attributes:
label: Reproducing
description: Help us reproduce what you're seeing.
placeholder: |
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true

- type: textarea
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
placeholder: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend diam non condimentum tincidunt. Vestibulum convallis eget ante dapibus eleifend.
validations:
required: true

- type: textarea
attributes:
label: Your environment
description: Give us as many details as you can about your environment, whether that's on Platform.sh (your configuration YAMLs), or locally (your OS, services, and local development tool).
placeholder: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend diam non condimentum tincidunt. Vestibulum convallis eget ante dapibus eleifend.
validations:
required: true

- type: textarea
attributes:
label: Screenshots
description: If applicable, add screenshots to help explain your problem.
placeholder: A picture's worth a thousand words...
validations:
required: false

- type: textarea
attributes:
label: Additional context
description: Optionally add any other information or screenshots that could help us understand and implement the change.
placeholder: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend diam non condimentum tincidunt. Vestibulum convallis eget ante dapibus eleifend.
validations:
required: false

8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Community Support
url: https://community.platform.sh/
about: Please ask and answer questions here.
- name: Join us on Slack
url: https://chat.platform.sh/
about: Ping the `@devrel_team`!
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/improvements.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Feature request
description: For changes to improve this template.
labels:
- 'feature request'
body:
- type: markdown
attributes:
value: |
Thanks for your interest in helping improve the Platform.sh templates!
Please fill in the fields below so we can understand what changes you'd like to see.

- type: textarea
attributes:
label: What in this template can be improved or added as a feature?
description: Is your feature request related to a problem? Please describe.
placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true

- type: textarea
attributes:
label: What exactly should be updated?
description: |
- Share as much detail as you can to help us understand the suggestion.
- What do you expect as an outcome?
validations:
required: true

- type: textarea
attributes:
label: How important is this feature to you?
description: Does this template lacking this feature block your work?
validations:
required: true

- type: textarea
attributes:
label: Additional context
description: Optionally add any other information or screenshots that could help us understand and implement the change.
validations:
required: false
34 changes: 34 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
## Description
Please describe your changes in detail according to the information below

## Related Issue
This project only accepts pull requests related to open issues.
- If suggesting a new feature or change, please discuss it in an issue first
- If fixing a bug, there should be an issue describing it with steps to reproduce it following the bug report guide
- If you're suggesting a feature, please follow the feature request guide by clicking on issues

### Please drop a link to the issue here:

## Motivation and Context
Why is this change required? What problem does it solve?

## How Has This Been Tested?
Please describe in detail how you tested your changes. Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc.

## Screenshots (if appropriate):

## Types of changes
What types of changes does your code introduce? Put an `x` in all the boxes that apply:

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Checklist:
Go over all the following list, and put an `x` in all the boxes that apply. If you're unsure about what any of these mean, don't hesitate to ask. We're here to help!

- [ ] I have read the contribution guide
- [ ] I have created an issue following the issue guide
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
29 changes: 29 additions & 0 deletions .github/workflows/autopr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Trigger Auto PR on push to update branch
on:
push:
branches:
- update
workflow_dispatch:

env:
PLATFORMSH_CLI_TOKEN: ${{ secrets.TEMPLATES_CLI_TOKEN }}

jobs:
create-auto-pr:
name: "Creates an auto merging PR when the branch is updated"
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'platformsh-templates' }}
steps:
- name: 'Prep the repo for autoPR'
id: prepautopr
uses: platformsh/gha-prep-for-autopr@main
with:
github-token: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}

- name: 'Create & merge PR'
id: create-merge-pr
uses: platformsh/gha-create-autopr@main
with:
github-token: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}
trigger-source: 'auto push'
default-branch: ${{ steps.prepautopr.outputs.default-branch }}
57 changes: 57 additions & 0 deletions .github/workflows/sourceops.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Trigger Source Operations on a Schedule
on:
schedule:
# Run at 00:15 every day
- cron: '15 0 * * *'
workflow_dispatch:

env:
PLATFORMSH_CLI_TOKEN: ${{ secrets.TEMPLATES_CLI_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}

jobs:
run_dm_update:
name: Trigger Source Op
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'platformsh-templates' }}
steps:
- name: 'Setup Python'
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: "Install PSH CLI tool"
run: |
curl -fsS https://platform.sh/cli/installer | php
# for some reason, sourcing our .bashrc file does not successfully prepend our path to PATH
export PATH="${HOME}/.platformsh/bin:${PATH}"
- uses: actions/checkout@v2
- name: 'Get project ID'
run: |
# grab the array entries where config.url contain 'platform.sh' then map back to an array. if our
# array length is 1, return the entry for config.url, otherwise return error
integrationURL=$(gh api "/repos/${{ github.repository }}/hooks" | jq 'map(select(.config.url | contains("platform.sh"))) | if . | length == 1 then .[0].config.url else "error" end')
if [[ "error" == "${integrationURL}" ]]; then
echo "::error::Either more than one webhook, or zero webhooks were returned. I was expecting just one."
exit 1
fi

projIDpttrn='\/projects\/([^\/]+)\/integrations'
if [[ "${integrationURL}" =~ ${projIDpttrn} ]]; then
echo "PLATFORM_PROJECT=${BASH_REMATCH[1]}" >> $GITHUB_ENV
echo "::notice::Project ID is ${BASH_REMATCH[1]}"
#echo "::set-output name=projectID::${BASH_REMATCH[1]}"
else
echo "::error::We were unable to extract the project ID from the integration url of ${integrationURL}"
exit 1
fi

- name: 'Run SourceOp Tools'
run: |
if [[ "${PATH}" != *".platformsh"* ]]; then
echo "psh installer not in PATH"
export PATH="${HOME}/.platformsh/bin:${PATH}"
fi
printf "Beginning Source Operations toolkit install...\n"

curl -fsS https://raw.githubusercontent.com/platformsh/source-operations/main/setup.sh | { bash /dev/fd/3 trigger-sopupdate; } 3<&0

38 changes: 38 additions & 0 deletions .github/workflows/testprenvironment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: "TestPrEnvironment"
on:
workflow_run:
workflows: [ "platformsh" ]
types:
- completed
pull_request:
branches:
- master
env:
GITHUB_TOKEN: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}
jobs:
test-pr-env:
name: TestPrEnvironment
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'platformsh-templates' }}
steps:
- name: 'Wait for psh and get target url'
id: get-target-url
uses: platformsh/gha-retrieve-psh-prenv-url@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: 'Does Our App Work?'
id: test-environment
run: |
target_url=${{ steps.get-target-url.outputs.target_url }}
echo "::notice::The target url returned from our github action: ${target_url}"
#ok, so for whatever strange reason, our integration returns the http version of the PR environment, not https
#hence to parameter expansion replacement.
#we dont need the whole response (yet), just see if we get a 200
response=$(curl -s -o /dev/null -I -w "%{http_code}" "${target_url//http:/https:}");
if [[ "200" == "${response}" ]]; then
echo "::notice::Environment responded with http header 200"
else
echo "::error::Response from environment was something other than 200. Response returned was ${response}"
exit 1;
fi

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
web/app/plugins/*
!web/app/plugins/.gitkeep
web/app/mu-plugins/*/
web/app/themes/twentytwentytwo/
web/app/themes/twentytwentythree/
web/app/upgrade
web/app/uploads/*
!web/app/uploads/.gitkeep
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
### 1.21.1: 2022-11-16
* ⬆️ Bump roots/wordpress to v6.1.1 ([#659](https://github.com/roots/bedrock/pull/659))

### 1.21.0: 2022-11-01
* ➕ Replace `twentytwentytwo` with `twentytwentythree` ([#655](https://github.com/roots/bedrock/pull/655))
* ⬆️ Bump roots/wordpress to v6.1 ([#654](https://github.com/roots/bedrock/pull/654))

### 1.20.3: 2022-10-18
* Bump roots/wordpress from 6.0.2 to 6.0.3 ([#652](https://github.com/roots/bedrock/pull/652))

### 1.20.2: 2022-08-31
* Bump roots/wordpress from 6.0.1 to 6.0.2 ([#648](https://github.com/roots/bedrock/pull/648))
* Bump composer/installers from 2.1.1 to 2.2.0 ([#646](https://github.com/roots/bedrock/pull/646))
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
"require": {
"php": ">=7.4",
"composer/installers": "^2.2",
"vlucas/phpdotenv": "^5.4",
"vlucas/phpdotenv": "^5.5",
"oscarotero/env": "^2.1",
"roots/bedrock-autoloader": "^1.0",
"roots/bedrock-disallow-indexing": "^2.0",
"roots/wordpress": "^6.0.2",
"roots/wordpress": "^6.1.1",
"roots/wp-config": "1.0.0",
"roots/wp-password-bcrypt": "1.1.0",
"wpackagist-theme/twentytwentytwo": "^1.2",
"wpackagist-theme/twentytwentythree": "^1.0",
"platformsh/config-reader": "^2.4",
"wp-cli/wp-cli-bundle": "^2.6",
"psy/psysh": "^0.11.8"
"wp-cli/wp-cli-bundle": "^2.7",
"psy/psysh": "^0.11.11"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.7.1",
Expand Down
Loading