Skip to content

Commit 1b02a97

Browse files
authored
Try to run the dist composer steps in the container again. (#707)
* test * Fix paths for composer files
1 parent a7a5134 commit 1b02a97

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

.circleci/config.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,24 +138,22 @@ jobs:
138138
- run:
139139
name: Reset composer.json and composer.lock
140140
command: |
141-
cd demo
142-
rm -f composer.json composer.lock
143-
cp templates/composer.json composer.json
144-
cp templates/composer.lock composer.lock
145-
rm -rf templates
141+
rm -f demo/composer.json demo/composer.lock
142+
cp demo/templates/composer.json demo/composer.json
143+
cp demo/templates/composer.lock demo/composer.lock
144+
rm -rf demo/templates
146145
# Reset vfancy, otherwise composer will complain that "The .git directory is missing from docroot/vfancy"
147146
# and won't run update
148147
- run:
149148
name: Reset vfancy
150149
command: |
151-
cd demo
152-
rm -rf docroot/vfancy/*
153-
cd docroot/vfancy
154-
git init
155-
git remote add origin https://github.com/jsdrupal/drupal-admin-ui-dist.git
156-
git remote add composer https://github.com/jsdrupal/drupal-admin-ui-dist.git
157-
git fetch origin
158-
git reset --hard origin/master
150+
docker exec -it drupal_admin_ui_drupal rm -rf docroot/vfancy/*
151+
docker exec -it drupal_admin_ui_drupal /bin/sh -c "cd docroot/vfancy && \
152+
git init && \
153+
git remote add origin https://github.com/jsdrupal/drupal-admin-ui-dist.git && \
154+
git remote add composer https://github.com/jsdrupal/drupal-admin-ui-dist.git && \
155+
git fetch origin && \
156+
git reset --hard origin/master"
159157
- run:
160158
name: Refresh composer.lock to point to new admin-ui-support commit
161159
command: docker exec -it drupal_admin_ui_drupal composer update justafish/drupal-admin-ui-support --lock

0 commit comments

Comments
 (0)