Skip to content

Commit

Permalink
Update to latest upstream.
Browse files Browse the repository at this point in the history
  • Loading branch information
gilzow committed Jul 27, 2023
1 parent 05b60d2 commit a7fc3ae
Show file tree
Hide file tree
Showing 40 changed files with 2,065 additions and 16,270 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
Expand Down
12 changes: 9 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_HOST=mailpit
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
Expand All @@ -46,7 +46,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_HOST=
PUSHER_PORT=443
PUSHER_SCHEME=https
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_HOST="${PUSHER_HOST}"
VITE_PUSHER_PORT="${PUSHER_PORT}"
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@

/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
30 changes: 12 additions & 18 deletions .github/workflows/autopr.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
########################################################################################################################
## ##
## This github workflow file is part of the Platform.sh process of updating and maintaining our collection of ##
## templates. For more information see https://github.com/platformsh-templates/ghrw-templates ##
## and https://github.com/search?q=topic%3Agithub-action+org%3Aplatformsh ##
## ##
## YOU CAN SAFELY DELETE THIS FILE ##
## ##
########################################################################################################################
name: Trigger Auto PR on push to update branch
on:
push:
Expand All @@ -9,21 +18,6 @@ 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 }}
run-reusable-autopr:
uses: platformsh-templates/ghrw-templates/.github/workflows/autopr.yaml@main
secrets: inherit
20 changes: 20 additions & 0 deletions .github/workflows/post-pr-acceptance.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
########################################################################################################################
## ##
## This github workflow file is part of the Platform.sh process of updating and maintaining our collection of ##
## templates. For more information see https://github.com/platformsh-templates/ghrw-templates ##
## and https://github.com/search?q=topic%3Agithub-action+org%3Aplatformsh ##
## ##
## YOU CAN SAFELY DELETE THIS FILE ##
## ##
########################################################################################################################
name: Runs post merge-acceptance workflows
on:
push:
branches:
- main
- master

jobs:
run-reusable-post-pr-acceptance:
uses: platformsh-templates/ghrw-templates/.github/workflows/post-pr-acceptance.yaml@main
secrets: inherit
20 changes: 20 additions & 0 deletions .github/workflows/project-issues.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
########################################################################################################################
## ##
## This github workflow file is part of the Platform.sh process of updating and maintaining our collection of ##
## templates. For more information see https://github.com/platformsh-templates/ghrw-templates ##
## and https://github.com/search?q=topic%3Agithub-action+org%3Aplatformsh ##
## ##
## YOU CAN SAFELY DELETE THIS FILE ##
## ##
########################################################################################################################
name: Sync repository issues to template-builder project

on:
issues:
types:
- opened

jobs:
run-reusable-issue-sync:
uses: platformsh-templates/ghrw-templates/.github/workflows/project-issues.yaml@main
secrets: inherit
27 changes: 12 additions & 15 deletions .github/workflows/sourceops.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
########################################################################################################################
## ##
## This github workflow file is part of the Platform.sh process of updating and maintaining our collection of ##
## templates. For more information see https://github.com/platformsh-templates/ghrw-templates ##
## and https://github.com/search?q=topic%3Agithub-action+org%3Aplatformsh ##
## ##
## YOU CAN SAFELY DELETE THIS FILE ##
## ##
########################################################################################################################
name: Trigger Source Operations on a Schedule
on:
schedule:
# Run at 00:15 every day
- cron: '15 */19 * * *'
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: 'Run source ops'
id: run-source-op
uses: platformsh/gha-run-sourceops-update@main
with:
github_token: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}
platformsh_token: ${{ secrets.TEMPLATES_CLI_TOKEN }}
run-reusable-sop-update:
uses: platformsh-templates/ghrw-templates/.github/workflows/sourceops.yaml@main
secrets: inherit
50 changes: 22 additions & 28 deletions .github/workflows/testprenvironment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
name: "TestPrEnvironment"
########################################################################################################################
## ##
## This github workflow file is part of the Platform.sh process of updating and maintaining our collection of ##
## templates. For more information see https://github.com/platformsh-templates/ghrw-templates ##
## and https://github.com/search?q=topic%3Agithub-action+org%3Aplatformsh ##
## ##
## YOU CAN SAFELY DELETE THIS FILE ##
## ##
########################################################################################################################
name: "TestPullRequestEnv"
run-name: "TestPullRequestEnv"
on:
workflow_run:
workflows: [ "platformsh" ]
Expand All @@ -8,31 +18,15 @@ on:
branches:
- master
- main
env:
# @todo I dont think this is needed anymore
GITHUB_TOKEN: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}
jobs:
test-pr-env:
name: TestPrEnvironment
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'platformsh-templates' }}
steps:
- name: 'Get Project ID'
id: 'get-proj-id'
uses: platformsh/gha-retrieve-projectid@main
with:
github_token: ${{ secrets.TEMPLATES_GITHUB_TOKEN }}

- name: 'Get Production URL'
id: 'get-prod-url'
uses: platformsh/gha-retrieve-production-url@main
with:
platformsh_token: ${{ secrets.TEMPLATES_CLI_TOKEN }}
project_id: ${{ steps.get-proj-id.outputs.project_id }}

- name: 'Run Pull Request Tests'
id: get-target-url
uses: platformsh/gha-template-pr-tests@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
baseline-url: ${{ steps.get-prod-url.outputs.production_url }}
jobs:
# !!!! WARNING !!!! #
# If for some reason you decide to change this jobid from `TestPrEnv-CW` to something else, you will also need to
# add a repository variable of CW_JOBID with a value of the new jobid.
# Explanation: the jobid below is part of the status check name that is used in preparing the repository for an
# auto-accepting PR. If you change the jobid below, but do not add the repo variable with this value, then the repository
# will be configured to require a status check that does not exist and it will be unable to accept the PR. In addition,
# you will be blocked from accepting the PR until you remove it from the repo's settings
TestPrEnv-CW:
uses: platformsh-templates/ghrw-templates/.github/workflows/testprenvironment.yaml@main
secrets: inherit
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
/node_modules
/public/build
/public/hot
/public/storage
/storage/*.key
/vendor
.env
.env.backup
.env.production
.phpunit.result.cache
Homestead.json
Homestead.yaml
auth.json
npm-debug.log
yarn-error.log
/.fleet
/.idea
/.vscode
Loading

0 comments on commit a7fc3ae

Please sign in to comment.