prima-twig 0.53.51 → 0.53.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b5f832052d40f2942286b9856aa8bc1923cf7c8bf4023e6b705a6dbd92fa22
-  data.tar.gz: b9f2b52e718836ebd10fbcc05360654a63639c0583632dcb1aaacd58ea2d38be
+  metadata.gz: 6cd8b554d39a3e8f6340af1bebfc11a5ff940d6540a6dcac9c5e5a6454d6e4d4
+  data.tar.gz: e205ada8c95ccda3a902ebd5c04c35e2ccfbea1dbb40cfa7b5927db4c6dfb6f6
 SHA512:
-  metadata.gz: d85931459b114b0830804c5f5eacfdf2fb71cbebdbeb9d08c50b24ad435c44b7f92eb32016b0efac53cb63683233259ff8a9328a41178502629099f1c1c0f954
-  data.tar.gz: 861a8a32a4d28801f0d7c886c5fe7a2edc351dbda1db04b0fd1fc10344e18fd3241a8a928e5759a6ac61e137b4d27569a764a811600e338fa0a385bba8003975
+  metadata.gz: fb9e5b856612e022a96d9fd0aa353a0f1bb198f65d1546426adcb3112c9f100765132f057d214031f536cdc631ad48d246f73bd9aecd168346660e08adb34ff2
+  data.tar.gz: 9a9569f85cbbc23e2ea519cc3f29bcfd33e436c8b7772fdc8730ea10a5c67b57281c5308f40cd102254f9720feaa787ea7040b4a351f5c255f9e82a741fd79f9

data/bin/twig-feature

@@ -471,7 +471,7 @@ class Release
   end
 
   def qainit_deploy!(quiet = false)
-    `git checkout master && git pull && git remote prune origin`
+    `git checkout master && git pull && git submodule update --init --recursive && git remote prune origin`
 
     default_name = get_default_branch_name @projects
     feature_number = ''
@@ -864,7 +864,7 @@ class Release
       },
       {
         parameter_key: "HostnamePattern",
-        parameter_value: "consumer-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1791,7 +1791,7 @@ class Release
       },
       {
         parameter_key: "HostnamePattern",
-        parameter_value: "consumer-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -2328,23 +2328,28 @@ class Release
 
     `mv docker-compose-ci.yml docker-compose.yml`
     exec_step 'prepare-docker-compose --directory crash && cp docker-compose-qainit.yml docker-compose.yml'
-    [
-      'docker-compose build web',
-      "docker-compose run -w $PWD -u root -e MIX_ENV=qa -e ENV_HASH=#{deploy_id} web \
-      '-c' 'mix local.hex --force && mix hex.info && \
-      mix deps.get && \
-      cd assets && \
-      yarn --cache-folder ~/.cache/yarn && \
-      NODE_ENV=production sysconfcpus -n 1 yarn run build && \
-      cd ../ && \
-      mix release.clean --implode --no-confirm && \
-      mix phx.digest && \
-      mix deps.clean --all && \
-      mix deps.get && \
-      mix compile && mix release --env=qa'",
-      'docker-compose down'
-    ].each do |cmd|
-      execute_command cmd
+
+    if File.exists? 'deploy/build_qa_artifact'
+      `deploy/build_qa_artifact #{deploy_id}`
+    else # TODO remove when deploy/build_qa_artifact is merged
+      [
+        'docker-compose build web',
+        "docker-compose run -w $PWD -u root -e MIX_ENV=qa -e ENV_HASH=#{deploy_id} web \
+        '-c' 'mix local.hex --force && mix hex.info && \
+        mix deps.get && \
+        cd assets && \
+        yarn --cache-folder ~/.cache/yarn && \
+        NODE_ENV=production sysconfcpus -n 1 yarn run build && \
+        cd ../ && \
+        mix release.clean --implode --no-confirm && \
+        mix phx.digest && \
+        mix deps.clean --all && \
+        mix deps.get && \
+        mix compile && mix release --env=qa'",
+        'docker-compose down'
+      ].each do |cmd|
+        execute_command cmd
+      end
     end
 
     cleanup_containers
@@ -2383,6 +2388,7 @@ class Release
       MIX_ENV=dev mix compile.sms && \
       MIX_ENV=dev mix compile.html && \
       MIX_ENV=dev mix compile.heml && \
+      MIX_ENV=dev mix compile.app_notification && \
       rm -rf _build/qa/rel/ && \
       mix release --env=qa'"
     ].each do |cmd|
@@ -2470,6 +2476,7 @@ class Release
 
     decrypt_secrets() unless File.exist?('config/secrets.yml')
 
+    exec_step 'git submodule update'
     exec_step 'cp docker-compose-ci.yml docker-compose.yml'
     exec_step 'prepare-docker-compose --directory hutch && cp docker-compose-qainit.yml docker-compose.yml'
     exec_step "sed s/qa_deploy_id/#{get_deploy_id}/ .env.dist.qa"
@@ -2534,15 +2541,20 @@ class Release
 
     exec_step 'cp docker-compose.yml docker-compose-ci.yml'
     exec_step 'prepare-docker-compose --directory peano && cp docker-compose-qainit.yml docker-compose.yml'
-    [
-      "docker-compose build web",
-      "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
-      '-c' 'mix local.hex --force && mix hex.info && \
-      mix deps.get && mix compile && mix deps.compile && \
-      rm -rf _build/qa/rel/ && \
-      mix release --env=qa'"
-    ].each do |cmd|
-      execute_command cmd
+
+    if File.exists? 'deploy/build_qa_artifact'
+      `deploy/build_qa_artifact`
+    else # TODO remove when deploy/build_qa_artifact is merged
+      [
+        "docker-compose build web",
+        "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
+        '-c' 'mix local.hex --force && mix hex.info && \
+        mix deps.get && mix compile && mix deps.compile && \
+        rm -rf _build/qa/rel/ && \
+        mix release --env=qa'"
+      ].each do |cmd|
+        execute_command cmd
+      end
     end
 
     cleanup_containers

data/bin/twig-update-ami

@@ -150,7 +150,7 @@ class TwigUpdateAmi
   end
 
   def update_packer(json_filename)
-    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -machine-readable ./#{json_filename} | tee build.log"
+    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -var drone_key=\"`biscuit get -f ../configs/secrets/common.yml drone_license_key`\" -machine-readable ./#{json_filename} | tee build.log"
     `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.53.51
+  version: 0.53.52
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -214,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt