Skip to content

Commit

Permalink
UNcommented tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Barbun committed Dec 15, 2024
1 parent 50ed1b6 commit 81c9c12
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 149 deletions.
262 changes: 131 additions & 131 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,41 +301,41 @@ jobs:

# Isolated theme build within a vanilla Drupal installation.
# This replicates (to a degree) what Drupal CI would do.
# build-isolated-php-82:
# <<: *runner_config
# docker:
# - image: cimg/php:8.2-browsers
# environment:
# DRUPAL_VERSION: 10.3
# DRUPAL_PROJECT_SHA: 10.x
# <<: *job-build-isolated
#
# build-isolated-php-83:
# <<: *runner_config
# docker:
# - image: cimg/php:8.3-browsers
# environment:
# DRUPAL_VERSION: 10.3
# DRUPAL_PROJECT_SHA: 10.x
# <<: *job-build-isolated
#
# build-isolated-php-83-legacy:
# <<: *runner_config
# docker:
# - image: cimg/php:8.3-browsers
# environment:
# DRUPAL_VERSION: 10.3
# DRUPAL_PROJECT_SHA: 10.x
# <<: *job-build-isolated
#
# build-isolated-php-83-next:
# <<: *runner_config
# docker:
# - image: cimg/php:8.3-browsers
# environment:
# DRUPAL_VERSION: 10@beta
# DRUPAL_PROJECT_SHA: 10.x
# <<: *job-build-isolated
build-isolated-php-82:
<<: *runner_config
docker:
- image: cimg/php:8.2-browsers
environment:
DRUPAL_VERSION: 10.3
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

build-isolated-php-83:
<<: *runner_config
docker:
- image: cimg/php:8.3-browsers
environment:
DRUPAL_VERSION: 10.3
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

build-isolated-php-83-legacy:
<<: *runner_config
docker:
- image: cimg/php:8.3-browsers
environment:
DRUPAL_VERSION: 10.3
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

build-isolated-php-83-next:
<<: *runner_config
docker:
- image: cimg/php:8.3-browsers
environment:
DRUPAL_VERSION: 10@beta
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

# build-isolated-php-84:
# <<: *runner_config
Expand Down Expand Up @@ -547,30 +547,30 @@ workflows:
# Commit workflow. Runs for every commit push to the remote repository.
commit:
jobs:
# - build-isolated-php-82:
# filters:
# branches:
# ignore: /^content\/.*/
# tags:
# only: /.*/
# - build-isolated-php-83:
# filters:
# branches:
# ignore: /^content\/.*/
# tags:
# only: /.*/
# - build-isolated-php-83-legacy:
# filters:
# branches:
# ignore: /^content\/.*/
# tags:
# only: /.*/
# - build-isolated-php-83-next:
# filters:
# branches:
# ignore: /^content\/.*/
# tags:
# only: /.*/
- build-isolated-php-82:
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
- build-isolated-php-83:
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
- build-isolated-php-83-legacy:
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
- build-isolated-php-83-next:
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
# - build-isolated-php-84:
# filters:
# branches:
Expand All @@ -584,11 +584,11 @@ workflows:
# tags:
# only: /.*/
- build-minimal:
# requires:
# - build-isolated-php-82
# - build-isolated-php-83
# - build-isolated-php-83-legacy
# - build-isolated-php-83-next
requires:
- build-isolated-php-82
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
Expand All @@ -597,11 +597,11 @@ workflows:
tags:
only: /.*/
- build-minimal-subtheme:
# requires:
# - build-isolated-php-82
# - build-isolated-php-83
# - build-isolated-php-83-legacy
# - build-isolated-php-83-next
requires:
- build-isolated-php-82
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
Expand All @@ -610,11 +610,11 @@ workflows:
tags:
only: /.*/
- build-govcms:
# requires:
# - build-isolated-php-82
# - build-isolated-php-83
# - build-isolated-php-83-legacy
# - build-isolated-php-83-next
requires:
- build-isolated-php-82
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
Expand All @@ -623,11 +623,11 @@ workflows:
tags:
only: /.*/
- build-govcms-subtheme:
# requires:
# - build-isolated-php-82
# - build-isolated-php-83
# - build-isolated-php-83-legacy
# - build-isolated-php-83-next
requires:
- build-isolated-php-82
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
Expand All @@ -636,55 +636,55 @@ workflows:
tags:
only: /.*/
- build-govcms-subtheme-sibling:
# requires:
# - build-isolated-php-82
# - build-isolated-php-83
# - build-isolated-php-83-legacy
# - build-isolated-php-83-next
requires:
- build-isolated-php-82
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
#
# - build-content-corporate:
# requires:
# - build-minimal
# - build-minimal-subtheme
# - build-govcms
# - build-govcms-subtheme
# - build-govcms-subtheme-sibling
# filters:
# branches:
# only: /^develop$|^release\/.*|^hotfix\/.*/
# tags:
# only: /.*/
# - build-content-highereducation:
# requires:
# - build-minimal
# - build-minimal-subtheme
# - build-govcms
# - build-govcms-subtheme
# - build-govcms-subtheme-sibling
# filters:
# branches:
# only: /^develop$|^release\/.*|^hotfix\/.*/
# tags:
# only: /.*/
# - build-content-government:
# requires:
# - build-minimal
# - build-minimal-subtheme
# - build-govcms
# - build-govcms-subtheme
# - build-govcms-subtheme-sibling
# filters:
# branches:
# only: /^develop$|^release\/.*|^hotfix\/.*/
# tags:
# only: /.*/

- build-content-corporate:
requires:
- build-minimal
- build-minimal-subtheme
- build-govcms
- build-govcms-subtheme
- build-govcms-subtheme-sibling
filters:
branches:
only: /^develop$|^release\/.*|^hotfix\/.*/
tags:
only: /.*/
- build-content-highereducation:
requires:
- build-minimal
- build-minimal-subtheme
- build-govcms
- build-govcms-subtheme
- build-govcms-subtheme-sibling
filters:
branches:
only: /^develop$|^release\/.*|^hotfix\/.*/
tags:
only: /.*/
- build-content-government:
requires:
- build-minimal
- build-minimal-subtheme
- build-govcms
- build-govcms-subtheme
- build-govcms-subtheme-sibling
filters:
branches:
only: /^develop$|^release\/.*|^hotfix\/.*/
tags:
only: /.*/

- deploy:
requires:
Expand Down Expand Up @@ -720,13 +720,13 @@ workflows:
tags:
ignore: /.*/

# - mirror-into-content-branches:
# requires:
# - build-content-corporate
# - build-content-highereducation
# - build-content-government
# filters:
# branches:
# only: develop
# tags:
# ignore: /.*/
- mirror-into-content-branches:
requires:
- build-content-corporate
- build-content-highereducation
- build-content-government
filters:
branches:
only: develop
tags:
ignore: /.*/
2 changes: 1 addition & 1 deletion .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DREVOPS_TZ="Australia/Melbourne"
################################################################################

# Drupal profile name (used only when installing from profile).
#DRUPAL_PROFILE=minimal
DRUPAL_PROFILE=minimal

# Drupal theme name.
DRUPAL_THEME=civictheme
Expand Down
6 changes: 6 additions & 0 deletions phpstan-govcms.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,9 @@ parameters:
message: 'please change the code'
- method: 'SQLite3Result::*()'
message: 'please change the code'
disallowedStaticCalls:
- method: 'Drupal::httpClient()'
message: 'please change the code'
disallowedNamespaces:
- class: 'GuzzleHttp\Client'
message: 'please change the code'
45 changes: 28 additions & 17 deletions shipshape.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ checks:
severity: high
path: web/themes/contrib/civictheme
disallowed-pattern: '^(adminer|phpmyadmin|bigdump)?\.php$'
# - name: '[FILE] Executable files'
# severity: normal
# path: ./
# disallowed-pattern: '.*\.(bin|deb|dmg|elf|exe|msi|sh)+$'
# exclude-pattern: '^(vendor|web/core|web/modules/contrib)+.*'
# - name: '[FILE] Sensitive public files'
# path: web/sites/default/files
# disallowed-pattern: '.*\.(sql|php|sh|py|bz2|gz|tar|tgz|zip)+$'
# exclude-pattern: '.*\.(css|js)\.gz?$'
# skip-dir:
# - private
- name: '[FILE] Executable files'
severity: normal
path: web/themes/contrib/civictheme
Expand Down Expand Up @@ -169,23 +180,23 @@ checks:
values:
- key: error_level
value: hide
drupal-file-module:
- name: '[FILE] Verify enabled modules'
severity: high
path: config/default
required:
- govcms_security
- httpav
- lagoon_logs
- tfa
disallowed:
- clamav
- dblog
- devel
- module_permissions_ui
- statistics
- update
- redirect_404
# drupal-file-module:
# - name: '[FILE] Verify enabled modules'
# severity: high
# path: config/default
# required:
# - govcms_security
# - httpav
# - lagoon_logs
# - tfa
# disallowed:
# - clamav
# - dblog
# - devel
# - module_permissions_ui
# - statistics
# - update
# - redirect_404
- name: '[FILE] Deprecated modules'
path: config/default
required: []
Expand Down

0 comments on commit 81c9c12

Please sign in to comment.