Commit 1e06ccb1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Habilita capas compiladas en src, mejora limpieza

See merge request redmic-project/client/web!105
parents 09e954a9 0118cdb0

.gitignore

+3 −3
Original line number Diff line number Diff line 
node_modules

dist

client-app/dist

client-app/build-report.txt

test_reports

.gitmodules.old

build-report.txt

*.tar.gz

*.tgz

*.log

.gitlab-ci.yml

+5 −5
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-service/custom-image.yml'

  - local: '/.gitlab-ci.scan.yml'

  - local: '/.gitlab-ci.test.yml'

  - local: '/.gitlab-ci.build.yml'

  - local: '/.gitlab-ci.package.yml'

  - local: '/.gitlab-ci.deploy.yml'

  - local: '/.gitlab-ci/scan.yml'

  - local: '/.gitlab-ci/test.yml'

  - local: '/.gitlab-ci/build.yml'

  - local: '/.gitlab-ci/package.yml'

  - local: '/.gitlab-ci/deploy.yml'



stages:

  - pre-build

.gitlab-ci.build.yml→.gitlab-ci/build.yml

+16 −13
Original line number Diff line number Diff line 
.web-build:

  image: ${WEB_BUILD_IMAGE_NAME}:${WEB_BUILD_IMAGE_TAG}

  variables:

    GIT_SUBMODULE_STRATEGY: normal

    GIT_SUBMODULE_STRATEGY: recursive

    WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build

    WEB_BUILD_IMAGE_TAG: latest

  before_script:

    - type yarn grunt java

    - yarn install

    - type npm

    - npm install

  cache:

    paths:

      - node_modules/

      - public/javascript/templates/node_modules/

      - public/stylesheets/node_modules/

      - client-app/dep/templates/node_modules/

      - client-app/style/node_modules/



prepare-unbuilt-version:

  extends: .web-build

  stage: pre-build

  script:

    - grunt preBuild

    - npm -v

    - node -v

  dependencies: []

  tags:

    - custom-runner
@@ -26,10 +27,11 @@ prepare-unbuilt-version: 
    expire_in: 1 week

    paths:

      - node_modules/

      - public/javascript/templates/dist/

      - public/stylesheets/style.styl

      - public/stylesheets/src/

      - public/stylesheets/submodules/

      - package-lock.json

      - client-app/dep/templates/dist/

      - client-app/style/style.styl

      - client-app/style/src/

      - client-app/style/dep/

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||
@@ -42,14 +44,15 @@ prepare-built-version: 
  extends: .web-build

  stage: build

  script:

    - grunt

    - npm pack

  dependencies: []

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

    expire_in: 1 month

    paths:

      - dist*.tar.gz

      - build-report.txt

      - package-lock.json

      - redmic-project-web-*.tgz

      - client-app/build-report.txt

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_PIPELINE_SOURCE == "schedule"

.gitlab-ci.deploy.yml→.gitlab-ci/deploy.yml

+0 −0

File moved.

View file

.gitlab-ci.package.yml→.gitlab-ci/package.yml

+0 −0

File moved.

View file