ci: improve composer install and publishing of docs

devowlio · Feb 10, 2020 · 44e2f38 · 44e2f38
1 parent 15dd378
commit 44e2f38
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ cache: &cache # see https://gitlab.com/gitlab-org/gitlab-runner/issues/2838#note
 # Only go on with the job if lerna detected changes
 .lerna changes:
     before_script:
-        - "[ ! -f $JOB_PACKAGE_FOLDER/$JOB_PACKAGE_NAME/.publish ] && echo $LERNA_SKIP_MESSAGE && exit 0"
+        - "[ ! -f $JOB_PACKAGE_FOLDER/$JOB_PACKAGE_NAME/.publish ] && [ ! $LERNA_CHANGES_FORCE ] && echo $LERNA_SKIP_MESSAGE && exit 0"
 
 # Initial installation so the cache gets filled
 install:

diff --git a/devops/.gitlab/stage-release.yml b/devops/.gitlab/stage-release.yml
@@ -34,7 +34,7 @@ docker review start:
         - yarn docker-compose:traefik --project-directory "$JOB_MOUNT_PATH/devops/docker-compose" up --build -d
         - export WP_WAIT_CONTAINER=$(yarn --silent docker-compose:traefik:name-wordpress)
         # Collect all builds and copy them to the container, and wait for the plugin until it is ready
-        - for slug in $(yarn --silent workspace:slugs); do for dirs in $(find plugins/$slug/build/* -maxdepth 0 -type d 2>/dev/null); do docker cp $dirs $WP_WAIT_CONTAINER:/var/www/html/wp-content/plugins/; done; done;
+        - for slug in $(yarn --silent workspace:slugs); do for dirs in $(find plugins/$slug/build/$slug* -maxdepth 0 -type d 2>/dev/null); do docker cp $dirs $WP_WAIT_CONTAINER:/var/www/html/wp-content/plugins/; done; done;
         - yarn wp-wait
     tags: [traefik]
     only:

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     ],
     "scripts": {
         "postinstall": "patch-package --patch-dir common/patch-package",
-        "bootstrap": "yarn install$(test $CI && echo ' --frozen-lockfile') && lerna exec -- yarn install$(test $CI && echo ' --frozen-lockfile') && lerna link && lerna run bootstrap --parallel && patch-package --patch-dir common/patch-package",
+        "bootstrap": "yarn install$(test $CI && echo ' --frozen-lockfile') && lerna exec -- yarn install$(test $CI && echo ' --frozen-lockfile') && lerna link && lerna run bootstrap && patch-package --patch-dir common/patch-package",
         "docker:start": "yarn docker-compose up --build -d && concurrently --raw \"yarn docker-compose logs -f -t --tail=10\" \"yarn --silent wp-wait && yarn --silent docker:start:dev\"",
         "docker:start:dev": "concurrently --raw \"TS_NODE_PROJECT=common/tsconfig.json yarn parallel-webpack --no-stats --config common/webpack.multi.ts --watch\" \"WORKSPACE_COMMAND='IS_DOCKER_START_COMMAND=1 yarn dev' yarn --silent workspace:concurrently\"",
         "docker:stop": "yarn docker-compose stop",

diff --git a/plugins/wp-reactjs-starter/package.json b/plugins/wp-reactjs-starter/package.json
@@ -11,9 +11,6 @@
         "yarn": ">=1.19.1"
     },
     "homepage": "https://matthias-web.com",
-    "apidoc": {
-        "sampleUrl": "/wp-json"
-    },
     "files": [
         "types/"
     ],