Skip to content

Commit

Permalink
Update Dokku Dev deploy actions
Browse files Browse the repository at this point in the history
  • Loading branch information
MlKilderkin committed Aug 29, 2024
1 parent 6263aef commit 3f28b0f
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 32 deletions.
2 changes: 2 additions & 0 deletions .deploy/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
wp/
wp-content/
.env
auth.json
24 changes: 6 additions & 18 deletions .deploy/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"php": "^8.2",
"johnpbloch/wordpress": "6.2.2",
"wpackagist-theme/twentytwentyone": "^1.5",
"advanced-custom-fields/advanced-custom-fields-pro": "^6.1",
"wpackagist-plugin/icon-block": "1.5.0",
"gravityforms/gravityforms": "^2.8"
"gravityforms/gravityforms": "^2.8",
"wpengine/advanced-custom-fields-pro": "6.3.5"
},
"extra": {
"wordpress-install-dir": "wp",
Expand All @@ -30,22 +30,10 @@
"type": "composer",
"url": "https://wpackagist.org"
},

{
"type": "package",
"package": {
"name": "advanced-custom-fields/advanced-custom-fields-pro",
"version": "6.1.6",
"type": "wordpress-plugin",
"dist": {
"type": "zip",
"url": "https://connect.advancedcustomfields.com/index.php?a=download&p=pro&k={%WP_PLUGIN_ACF_KEY}&t={%VERSION}"
},
"require": {
"ffraenz/private-composer-installer": "^5.0"
}
}
},
{
"type": "composer",
"url": "https://connect.advancedcustomfields.com"
},
{
"type": "package",
"package": {
Expand Down
31 changes: 17 additions & 14 deletions .deploy/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .github/workflows/dokku-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ jobs:
ssh_private_key: ${{ secrets.DOKKU_DEPLOY_KEY }}
slack_webhook: ${{ secrets.SLACK_WEBHOOK }}
composer_env: ${{ secrets.COMPOSER_ENV }}
auth_json: ${{ secrets.AUTH_JSON }}
8 changes: 8 additions & 0 deletions .github/workflows/pipeline-dokku.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ on:
type: string
description: Server to deploy
secrets:
auth_json:
required: true
github_pat_token:
required: true
ssh_private_key:
Expand Down Expand Up @@ -73,6 +75,12 @@ jobs:
ssh_private_key: ${{ secrets.ssh_private_key }}
server: ${{ inputs.server }}

- name: Create composer auth.json from secret
uses: jsdaniell/[email protected]
with:
name: 'auth.json'
json: ${{ secrets.auth_json }}

- name: Configure composer
run: |
echo "${{ secrets.composer_env }}" > .env
Expand Down

0 comments on commit 3f28b0f

Please sign in to comment.