ci: increase artifacts expire_in for dependencies + reorganise bundle & release jobs

.gitlab-ci.yml

@@ -14,7 +14,7 @@ php-dependencies:
   artifacts:
     paths:
       - vendor/
-    expire_in: 15 mins
+    expire_in: 30 mins
 
 js-dependencies:
   stage: prepare
@@ -24,7 +24,7 @@ js-dependencies:
   artifacts:
     paths:
       - node_modules/
-    expire_in: 15 mins
+    expire_in: 30 mins
 
 lint-commit-msg:
   stage: quality
@@ -68,13 +68,15 @@ tests:
 
 bundle:
   stage: bundle
+  before_script:
+    # prepare dependencies before bundling
+    - chmod +x ./scripts/bundle-prepare.sh
+    - ./scripts/bundle-prepare.sh
   script:
     # make scripts/bundle.sh executable
-    - chmod +x ./scripts/bundle-prepare.sh
     - chmod +x ./scripts/bundle.sh
 
     # bundle castopod-host with commit ref as version
-    - ./scripts/bundle-prepare.sh
     - ./scripts/bundle.sh ${CI_COMMIT_REF_SLUG}_${CI_COMMIT_SHORT_SHA}
   dependencies:
     - php-dependencies
@@ -90,18 +92,18 @@ bundle:
 
 release:
   stage: release
-  script:
+  before_script:
-    # make release scripts executable
-    - chmod +x ./scripts/bundle-prepare.sh
-    - chmod +x ./scripts/bundle.sh
-    - chmod +x ./scripts/package.sh
-
-    # prepare bundle before release, both bundle and package scripts will be run by semantic-release
-    - ./scripts/bundle-prepare.sh
-
     # IMPORTANT: delete local git tags before release to prevent eventual script failure (ie. tag already exists)
     - git tag | xargs git tag -d
 
+    # prepare dependencies before release, both bundle and package scripts will be run by semantic-release
+    - chmod +x ./scripts/bundle-prepare.sh
+    - ./scripts/bundle-prepare.sh
+  script:
+    # make release scripts executable
+    - chmod +x ./scripts/bundle.sh
+    - chmod +x ./scripts/package.sh
+
     # run semantic-release script (configured in `.releaserc.json` file)
     - npm run release
   dependencies:

scripts/bundle-prepare.sh

@@ -3,5 +3,5 @@
 # install only production dependencies using the --no-dev option
 php composer.phar install --no-dev --prefer-dist --no-ansi --no-interaction --no-progress --ignore-platform-reqs
 
-# build all production UI assets
+# build all production static assets (css, js, images, icons, fonts, etc.)
 npm run build