diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 8f4b98b371ea740533c5d9fbc93be94ff88474e5..a4537bf88ba4438e5f7c3ff3854ff7bf02622ed4 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -17,13 +17,11 @@ stages: when: always variables: APP_ENV: "staging" - SHOPIFY_APP_CLIENT_ID: $STAGING_SHOPIFY_APP_CLIENT_ID MANTLE_PIXEL_TOKEN: $STAGING_MANTLE_PIXEL_TOKEN - if: '$CI_COMMIT_TAG' when: always variables: APP_ENV: "production" - SHOPIFY_APP_CLIENT_ID: $PRODUCTION_SHOPIFY_APP_CLIENT_ID MANTLE_PIXEL_TOKEN: $PRODUCTION_MANTLE_PIXEL_TOKEN .template: &deploy-rules @@ -69,11 +67,10 @@ build web frontend: image: node:latest artifacts: paths: - - web/frontend/dist + - web/backend/public/build stage: build before_script: - if [ "$APP_ENV" == "" ]; then echo "APP_ENV is empty" ; exit 1; fi - - if [ "$SHOPIFY_APP_CLIENT_ID" == "" ]; then echo "SHOPIFY_APP_CLIENT_ID is empty" ; exit 1; fi - echo $APP_ENV; - node -v - cd web/frontend @@ -108,7 +105,6 @@ deploy web: - ssh-keyscan -H -p $DEPLOY_PORT $DEPLOY_HOST >> ~/.ssh/known_hosts - export RSYNC_RSH="ssh -p $DEPLOY_PORT -v -i ~/.ssh/id_rsa_demo_fs" - rsync -v --delete -rlDe "$RSYNC_RSH" --exclude-from=web/backend/.distignore ${CI_PROJECT_DIR}/web/backend/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR - - rsync -v --delete -rlDe "$RSYNC_RSH" --exclude-from=web/frontend/.distignore ${CI_PROJECT_DIR}/web/frontend/dist/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR/public - ssh -p $DEPLOY_PORT -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && php bin/console doctrine:migrations:migrate --no-interaction && php bin/console cache:clear && $RUN_AFTER_DEPLOY" after_script: - $DEPLOY_AFTER_SCRIPT @@ -121,5 +117,5 @@ deploy app: image: node:latest stage: deploy script: - - npm ci + - npm ci --prefer-offline --no-audit - npm run deploy -- --force --version=$RELEASE_VERSION --config=$SHOPIFY_APP_CONFIG \ No newline at end of file