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

V2 #2

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

V2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ac1c42
add paragraphs, update composer
aekong Jun 29, 2020
2a45837
custom module for hook_update_n purposes
aekong Jun 29, 2020
aa555cf
custom theme for admin ui
aekong Jun 29, 2020
d52aec7
ignore node_modules for theme build
aekong Jun 29, 2020
bdf535a
task runner to build themes
aekong Jun 29, 2020
9c53835
update pantheon build image
aekong Jun 29, 2020
eeea6f5
remove dist folder from vcs
aekong Jun 29, 2020
d8e2eb0
correct path for theme dist
aekong Jun 29, 2020
bfd5420
Merge branch 'main' into v2
aekong Jun 29, 2020
29fbc90
add department content type, add record paragraph type
aekong Jun 29, 2020
b912aaa
add primary and secondary tabs to admin
aekong Jun 30, 2020
7ee06d2
config export update
aekong Jun 30, 2020
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
13 changes: 10 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
defaults: &defaults
docker:
- image: quay.io/pantheon-public/build-tools-ci:1.x
- image: quay.io/pantheon-public/build-tools-ci:6.x
working_directory: ~/example_drops_8_composer
environment:
#=========================================================================
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:

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

Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:

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

Expand All @@ -105,6 +105,13 @@ jobs:
name: build assets
command: composer -n build-assets

- run:
name: build theme assets
command: |
cd ./web/themes/custom/build
npm install
./node_modules/gulp/bin/gulp.js

- run:
name: prepare database for site-under test
command: ./.circleci/scripts/pantheon/02-init-site-under-test-clone-existing
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,9 @@ Thumbs.db

# ignore app directory created by lando
app

# ignore node_modules for themes
web/themes/custom/build/node_modules

# ignore theme compiled assets
web/themes/custom/itr_admin/dist
2 changes: 2 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"drupal/config_installer": "^1.0",
"drupal/console": "^1",
"drupal/core": "^8",
"drupal/entity_browser": "^2.5",
"drupal/paragraphs": "^1.12",
"drupal/restui": "^1.15",
"drupal/simple_block": "^1.0@beta",
"drush-ops/behat-drush-endpoint": "^0.0.5",
Expand Down
Loading