(EPROC-20383) Used jdk zulu

OpusCapita · Apr 6, 2021 · 46ee15e · 46ee15e
1 parent fc05c7d
commit 46ee15e
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 defaults: &defaults
   docker:
-    - image: opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u192-nodejs-8.17.0-maven-3.3.9
+    - image: opuscapita/minsk-core-ci:4
   working_directory: ~/build
 
 version: 2.1
@@ -9,13 +9,15 @@ orbs:
   jira: circleci/jira@1.2.2
 
 jobs:
+  init:
+    docker:
+      - image: opuscapita/minsk-core-machineuser-env:2
+    steps:
+      - run: circle_ci_add_env.sh GH_MAIL GH_NAME
+
   build:
     <<: *defaults
     steps:
-      - run:
-          name: Environment inject.
-          command: env_inject.sh
-
       - checkout
 
       - restore_cache:
@@ -24,6 +26,8 @@ jobs:
             - i18n-{{ .Branch }}
             - i18n
 
+      - run: if [ -f /.dockerenv ]; then configure-maven.sh && configure-grails.sh && configure-npm.sh; fi
+
       - run:
           name: "Installing dependencies."
           command: yarn install
@@ -59,10 +63,6 @@ jobs:
   build_release:
     <<: *defaults
     steps:
-      - run:
-          name: Environment inject
-          command: /bin/env_inject.sh
-
       - checkout
 
       - restore_cache:
@@ -71,6 +71,8 @@ jobs:
             - i18n-{{ .Branch }}
             - i18n
 
+      - run: if [ -f /.dockerenv ]; then configure-maven.sh && configure-grails.sh && configure-npm.sh; fi
+
       - run:
           name: "Installing dependencies."
           command: yarn install
@@ -92,13 +94,10 @@ jobs:
   release:
     <<: *defaults
     steps:
-
-      - run:
-          name: Environment inject
-          command: env_inject.sh
-
       - checkout
-
+
+      - run: if [ -f /.dockerenv ]; then configure-maven.sh && configure-grails.sh && configure-npm.sh; fi
+
       - run:
           name: Executing release scrtipt.
           command: .circleci/release.sh
@@ -107,20 +106,33 @@ workflows:
   version: 2
   release-and-build:
     jobs:
+      - init:
+          filters:
+            tags:
+              only: /.*/
       - release:
           filters:
             branches:
               only: release
+          requires:
+            - init
+          post-steps:
+            - jira/notify
       - build:
           filters:
             branches:
               ignore: release
+          requires:
+            - init
           post-steps:
             - jira/notify
-
       - build_release:
           filters:
             tags:
               only: /.*/
             branches:
               ignore: /.*/
+          requires:
+            - init
+          post-steps:
+            - jira/notify