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.

Sign up for GitHub

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

Dev into main #124

Merged
merged 14 commits into from
Nov 7, 2023
Merged

Dev into main #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e7a5048
Add Hale Dash Theme
RobLoweMOJ Oct 2, 2023
87f880f
Add Hale Dash to action build
RobLoweMOJ Oct 4, 2023
bd3ff48
Merge pull request #111 from ministryofjustice/main-merge-dev
brown-a2 Oct 6, 2023
c699df4
set dev to point to translations branch
MalcolmVonMoJ Oct 24, 2023
e4d9813
Test Packagist
RobLoweMOJ Nov 2, 2023
a67cb97
Hale back to releases
RobLoweMOJ Nov 2, 2023
a3bc94e
Add ACF Pro
RobLoweMOJ Nov 2, 2023
aa99031
Add secrets to all deployments
RobLoweMOJ Nov 2, 2023
9647226
Add html basic
RobLoweMOJ Nov 2, 2023
4eb4143
Update Plugin test
RobLoweMOJ Nov 6, 2023
0a83f88
Fix Conflict
RobLoweMOJ Nov 6, 2023
4b0f87e
Change s3 Uploads plugin to use main branch
brown-a2 Nov 6, 2023
04f9189
Change Hale name in composer json
brown-a2 Nov 7, 2023
81590e4
Change theme name in composer
brown-a2 Nov 7, 2023
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
12 changes: 10 additions & 2 deletions .github/workflows/cd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ jobs:
ecr-role: ${{ secrets.DEV_ECR_ROLE_TO_ASSUME }}
ecr-region: ${{ vars.DEV_ECR_REGION }}
ecr-repo: ${{ vars.DEV_ECR_REPOSITORY }}
cp-user: ${{ secrets.COMPOSER_USER }}
cp-password: ${{ secrets.COMPOSER_PASS }}
cp-user: ${{ secrets.PACKAGIST_USER }}
cp-password: ${{ secrets.PACKAGIST_PASSWORD }}
acf-user: ${{ secrets.ACF_USER }}
acf-password: ${{ secrets.ACF_PASSWORD }}
kube-cluster: ${{ secrets.KUBE_CLUSTER }}
kube-cert: ${{ secrets.KUBE_CERT }}
kube-namespace: ${{ secrets.KUBE_NAMESPACE }}
Expand Down Expand Up @@ -56,6 +58,8 @@ jobs:
ecr-repo: ${{ vars.DEMO_ECR_REPOSITORY }}
cp-user: ${{ secrets.COMPOSER_USER }}
cp-password: ${{ secrets.COMPOSER_PASS }}
acf-user: ${{ secrets.ACF_USER }}
acf-password: ${{ secrets.ACF_PASSWORD }}
kube-cluster: ${{ secrets.KUBE_CLUSTER }}
kube-cert: ${{ secrets.KUBE_CERT }}
kube-namespace: ${{ secrets.KUBE_NAMESPACE }}
Expand Down Expand Up @@ -91,6 +95,8 @@ jobs:
ecr-repo: ${{ vars.STAGING_ECR_REPOSITORY }}
cp-user: ${{ secrets.COMPOSER_USER }}
cp-password: ${{ secrets.COMPOSER_PASS }}
acf-user: ${{ secrets.ACF_USER }}
acf-password: ${{ secrets.ACF_PASSWORD }}
kube-cluster: ${{ secrets.KUBE_CLUSTER }}
kube-cert: ${{ secrets.KUBE_CERT }}
kube-namespace: ${{ secrets.KUBE_NAMESPACE }}
Expand Down Expand Up @@ -127,6 +133,8 @@ jobs:
ecr-repo: ${{ vars.PROD_ECR_REPOSITORY }}
cp-user: ${{ secrets.COMPOSER_USER }}
cp-password: ${{ secrets.COMPOSER_PASS }}
acf-user: ${{ secrets.ACF_USER }}
acf-password: ${{ secrets.ACF_PASSWORD }}
kube-cluster: ${{ secrets.KUBE_CLUSTER }}
kube-cert: ${{ secrets.KUBE_CERT }}
kube-namespace: ${{ secrets.KUBE_NAMESPACE }}
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/rw-build-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ on:
required: true
cp-password:
required: true
acf-user:
required: true
acf-password:
required: true
kube-cluster:
required: true
kube-cert:
Expand Down Expand Up @@ -100,12 +104,15 @@ jobs:
IMAGE_TAG: ${{ github.sha }}
- name: Run Composer
run: |
composer config http-basic.composer.wp.dsd.io ${{ secrets.cp-user }} ${{ secrets.cp-password }}
composer config http-basic.repo.packagist.com ${{ secrets.cp-user }} ${{ secrets.cp-password }}
composer config http-basic.connect.advancedcustomfields.com ${{ secrets.acf-user }} ${{ secrets.acf-password }}
composer install --prefer-dist --no-progress
- name: Run NPM
run: |
npm install --prefix ./wordpress/wp-content/themes/hale
npm run production --if-present --prefix ./wordpress/wp-content/themes/hale
npm install --prefix ./wordpress/wp-content/themes/hale-dash
npm run production --if-present --prefix ./wordpress/wp-content/themes/hale-dash
npm install --prefix ./wordpress/wp-content/themes/brookhouse
npm run production --if-present --prefix ./wordpress/wp-content/themes/brookhouse
npm install --prefix ./wordpress/wp-content/themes/lawcom
Expand Down
19 changes: 13 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
},
{
"type": "composer",
"url": "https://composer.wp.dsd.io"
"url": "https://repo.packagist.com/mojwb/hale-platform"
},
{
"type": "composer",
"url": "https://connect.advancedcustomfields.com"
},
{
"type": "composer",
Expand All @@ -34,11 +38,14 @@
"composer/installers": "^v1.7.0",
"vlucas/phpdotenv": "^3.0.0",
"oscarotero/env": "^1.1.0",
"acf/advanced-custom-fields-pro": "*",
"ministryofjustice/wp-hale": "*",
"wpengine/advanced-custom-fields-pro": "*",
"ministryofjustice/hale": "*",
"ministryofjustice/hale-dash": "dev-main",
"ministryofjustice/brookhouse": "dev-main",
"ministryofjustice/lawcom": "dev-main",
"ministryofjustice/justicejobs": "dev-main",
"ministryofjustice/ppo": "dev-main",
"ministryofjustice/hale-components": "dev-main",
"ministryofjustice/hale-dash": "dev-main",
"ministryofjustice/ppo": "dev-main",
"ministryofjustice/hale-components": "dev-main",
Expand Down Expand Up @@ -66,14 +73,14 @@
"wpackagist-plugin/wp-analytify":"*",
"wpackagist-plugin/wp-force-login": "*",
"wpackagist-plugin/wps-hide-login": "*",
"relevanssi/relevanssi-premium": "*",
"ministryofjustice/wp-moj-components": "dev-hale-platform",
"ministryofjustice/wp-user-roles": "*",
"ministryofjustice/cookie-compliance-for-wordpress": "*",
"ministryofjustice/wp-moj-blocks": "*",
"ministryofjustice/wp-gov-uk-notify": "*",
"ministryofjustice/wp-s3-uploads": "dev-master",
"ministryofjustice/wp-s3-uploads": "dev-main",
"ministryofjustice/feed-importer": "dev-main",
"relevanssi/relevanssi-premium": "*",
"sentry/sdk": "^3.3"
},
"require-dev": {
Expand All @@ -89,7 +96,7 @@
"ministryofjustice/wp-s3-uploads"
],
"wordpress/wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
"wordpress/wp-content/themes/hale/": ["ministryofjustice/wp-hale"],
"wordpress/wp-content/themes/hale/": ["ministryofjustice/hale"],
"wordpress/wp-content/themes/{$name}/": ["type:wordpress-theme"]
},
"wordpress-install-dir": "/var/www/html"
Expand Down