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

Remove custom themes for WETA pitch #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
186 changes: 93 additions & 93 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,31 +60,31 @@ jobs:
paths:
- bash_env.txt

static_tests:
<<: *defaults

steps:
- checkout

- restore_cache:
keys:
- composer-cache-{{ checksum "composer.lock" }}
- composer-cache-

- run:
# Set TERMINUS_ENV and related environment variables.
# https://github.com/pantheon-systems/docker-build-tools-ci/blob/6.x/scripts/set-environment
name: setup-environment-vars
command: /build-tools-ci/scripts/set-environment

- run:
name: run static tests
command: ./.ci/test/static/run

- save_cache:
key: composer-cache-{{ checksum "composer.lock" }}
paths:
- $HOME/.composer/cache
# static_tests:
# <<: *defaults
#
# steps:
# - checkout
#
# - restore_cache:
# keys:
# - composer-cache-{{ checksum "composer.lock" }}
# - composer-cache-
#
# - run:
# # Set TERMINUS_ENV and related environment variables.
# # https://github.com/pantheon-systems/docker-build-tools-ci/blob/6.x/scripts/set-environment
# name: setup-environment-vars
# command: /build-tools-ci/scripts/set-environment
#
# - run:
# name: run static tests
# command: ./.ci/test/static/run
#
# - save_cache:
# key: composer-cache-{{ checksum "composer.lock" }}
# paths:
# - $HOME/.composer/cache

build_php:
<<: *defaults
Expand All @@ -108,9 +108,9 @@ jobs:
name: run PHP build step
command: ./.ci/build/php

- run:
name: install theme composer dependencies
command: cd web/wp-content/themes/threespot-wp-sandbox && composer install --no-interaction --optimize-autoloader
# - run:
# name: install theme composer dependencies
# command: cd web/wp-content/themes/threespot-wp-sandbox && composer install --no-interaction --optimize-autoloader

- save_cache:
key: vendor-{{ checksum "composer.lock" }}
Expand All @@ -123,45 +123,45 @@ jobs:
- web
- vendor

build_yarn:
<<: *defaults
docker:
- image: circleci/node:14

steps:
- checkout

- restore_cache:
keys:
- yarn-packages-{{ checksum "web/wp-content/themes/threespot-wp-sandbox/yarn.lock" }}
- yarn-packages- # used if checksum fails

# nasm reaquired if using imagemin and mozjpeg
# - run:
# name: install nasm dependency
# command: sudo apt-get update && sudo apt-get install -y nasm

- run:
name: install theme yarn dependencies
command: cd web/wp-content/themes/threespot-wp-sandbox && yarn install

- run:
name: build theme assets
# If non-hashed versions of site assets are needed for 3rd parties, also run `yarn build:nohash`
command: cd web/wp-content/themes/threespot-wp-sandbox && yarn build:production

- save_cache:
name: cache Yarn files
key: yarn-packages-{{ checksum "web/wp-content/themes/threespot-wp-sandbox/yarn.lock" }}
paths:
- $HOME/.cache/yarn

- persist_to_workspace:
# Must be relative path from working_directory
root: .
# Must be relative path from root
paths:
- web/wp-content/themes/threespot-wp-sandbox/dist
# build_yarn:
# <<: *defaults
# docker:
# - image: circleci/node:14
#
# steps:
# - checkout
#
# - restore_cache:
# keys:
# - yarn-packages-{{ checksum "web/wp-content/themes/threespot-wp-sandbox/yarn.lock" }}
# - yarn-packages- # used if checksum fails
#
# # nasm reaquired if using imagemin and mozjpeg
# # - run:
# # name: install nasm dependency
# # command: sudo apt-get update && sudo apt-get install -y nasm
#
# - run:
# name: install theme yarn dependencies
# command: cd web/wp-content/themes/threespot-wp-sandbox && yarn install
#
# - run:
# name: build theme assets
# # If non-hashed versions of site assets are needed for 3rd parties, also run `yarn build:nohash`
# command: cd web/wp-content/themes/threespot-wp-sandbox && yarn build:production
#
# - save_cache:
# name: cache Yarn files
# key: yarn-packages-{{ checksum "web/wp-content/themes/threespot-wp-sandbox/yarn.lock" }}
# paths:
# - $HOME/.cache/yarn
#
# - persist_to_workspace:
# # Must be relative path from working_directory
# root: .
# # Must be relative path from root
# paths:
# - web/wp-content/themes/threespot-wp-sandbox/dist

deploy_to_pantheon:
<<: *defaults
Expand Down Expand Up @@ -226,30 +226,30 @@ jobs:
path: /tmp/artifacts
destination: artifacts

visual_regression_test:
<<: *defaults
docker:
- image: backstopjs/backstopjs:4.1.9
steps:
- checkout

- attach_workspace:
at: /tmp/workspace

- run: cp /tmp/workspace/bash_env.txt $BASH_ENV
- run: echo "export CI_BUILD_URL='${CIRCLE_BUILD_URL}'" >> $BASH_ENV
- run: echo "export CI_NODE_INDEX='${CIRCLE_NODE_INDEX}'" >> $BASH_ENV
- run: echo "export CI_REPOSITORY_URL='${CIRCLE_REPOSITORY_URL}'" >> $BASH_ENV
- run: echo "export ARTIFACTS_DIR_URL='${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/artifacts'" >> $BASH_ENV
- run: source $BASH_ENV

- run:
name: visual regression test
command: ./.ci/test/visual-regression/run

- store_artifacts:
path: /tmp/artifacts
destination: artifacts
#visual_regression_test:
# <<: *defaults
# docker:
# - image: backstopjs/backstopjs:4.1.9
# steps:
# - checkout
#
# - attach_workspace:
# at: /tmp/workspace
#
# - run: cp /tmp/workspace/bash_env.txt $BASH_ENV
# - run: echo "export CI_BUILD_URL='${CIRCLE_BUILD_URL}'" >> $BASH_ENV
# - run: echo "export CI_NODE_INDEX='${CIRCLE_NODE_INDEX}'" >> $BASH_ENV
# - run: echo "export CI_REPOSITORY_URL='${CIRCLE_REPOSITORY_URL}'" >> $BASH_ENV
# - run: echo "export ARTIFACTS_DIR_URL='${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/artifacts'" >> $BASH_ENV
# - run: source $BASH_ENV
#
# - run:
# name: visual regression test
# command: ./.ci/test/visual-regression/run
#
# - store_artifacts:
# path: /tmp/artifacts
# destination: artifacts

composer_lock_updater:
<<: *defaults
Expand All @@ -276,12 +276,12 @@ workflows:
jobs:
- configure_env_vars
# - static_tests
- build_yarn
# - build_yarn
- build_php
- deploy_to_pantheon:
requires:
# - static_tests
- build_yarn
# - build_yarn
- build_php
# - visual_regression_test:
# requires:
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"wpackagist-plugin/duplicate-post": "^4.1",
"wpackagist-plugin/enable-media-replace": "^3.6",
"wpackagist-plugin/favicon-by-realfavicongenerator": "^1.3",
"wpackagist-plugin/filebird": "^4.9.8",
"wpackagist-plugin/fly-dynamic-image-resizer": "^2.0.5",
"wpackagist-plugin/lh-hsts": "^1.25",
"wpackagist-plugin/pantheon-advanced-page-cache": "^1.0",
Expand Down
20 changes: 19 additions & 1 deletion composer.lock

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

17 changes: 0 additions & 17 deletions web/wp-content/themes/threespot-wp-sandbox/.editorconfig

This file was deleted.

48 changes: 0 additions & 48 deletions web/wp-content/themes/threespot-wp-sandbox/.eslintrc.js

This file was deleted.

9 changes: 0 additions & 9 deletions web/wp-content/themes/threespot-wp-sandbox/.gitignore

This file was deleted.

34 changes: 0 additions & 34 deletions web/wp-content/themes/threespot-wp-sandbox/.stylelintrc.js

This file was deleted.

1 change: 0 additions & 1 deletion web/wp-content/themes/threespot-wp-sandbox/.tool-versions

This file was deleted.

Loading