gha_config 0.20 → 0.24

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f38b004057c7f52c5d24ccd7d75d65e323dbc64f57256f472b32e7b5d03a63cf
4
- data.tar.gz: c0405f8dcc6adb2457267eaccc6fee2e30d2247f0d4dc0db744f5d82903017ee
3
+ metadata.gz: 64afb109f444763b042f74528a4129b0844a7e4e7d4448a7412625fc1563b921
4
+ data.tar.gz: 1c8a9cff1061f13e6d7fce3180a6032ff7e0e7e4c88851f40916c36648be82cb
5
5
  SHA512:
6
- metadata.gz: 37a0c649ee04795bc424852b31fef982eac4cadb765e6e87857f3ab546d9a58e746653f068a8211f16345f823f756fb13b05c4c0e5a273207fc4b9ed594d31f9
7
- data.tar.gz: 01c6da0bcee2d280badb5deca83cbb51b18f9c402064c3b58ddc0feadce438bf53eed6c2663dc202531e14a61d1be2fa76936e899022cbacc6cd13249873a0eb
6
+ metadata.gz: 6ff11343277dea13aa1fea6624336d1b174f746545ca6a19c75035c00ed85fa2f7d2b16491274879d1b71b3c312b2e63690f79d54a9d1c20cb7fb0f71838df2d
7
+ data.tar.gz: 0c3cd1d8ef9b27a7f45183c717fd2808da3d6f86a3d87ab31ef9983354bd82eba3ad196f596f19cc963375cfdc00077082416734b9bec8722b7c262a054b2b23
data/CHANGELOG.md CHANGED
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
5
5
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
6
6
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
 
8
+ # [0.24] - 2022-02-10
9
+ - Allows override of the `checkout` step.
10
+
11
+ # [0.22] - 2021-11-16
12
+ - Fixed so root-level `env` are not overridden by defaults.
13
+
14
+ ## [0.21] - 2021-08-20
15
+ - Added ARTIFACTORY env variables by default for Scala builds.
16
+
8
17
  ## [0.20] - 2021-08-09
9
18
  - Added `_variables_` for substitution.
10
19
 
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gha_config (0.15)
4
+ gha_config (0.22)
5
5
 
6
6
  GEM
7
7
  remote: https://flipplib.jfrog.io/flipplib/api/gems/flipp-gems/
@@ -35,4 +35,4 @@ DEPENDENCIES
35
35
  rubocop
36
36
 
37
37
  BUNDLED WITH
38
- 2.2.21
38
+ 2.2.26
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module GhaConfig
4
- VERSION = '0.20'
4
+ VERSION = '0.24'
5
5
  end
@@ -10,7 +10,7 @@ module GhaConfig
10
10
  default_env = {
11
11
  'SLACK_CHANNEL' => ''
12
12
  }
13
- output_hash['env'] = default_env.merge(config.env).
13
+ output_hash['env'] = default_env.
14
14
  merge({
15
15
  'HOME' => '/home/circleci',
16
16
  'AWS_ACCESS_KEY_ID' => '${{ secrets.AWS_ACCESS_KEY_ID }}',
@@ -26,8 +26,12 @@ module GhaConfig
26
26
  'SERVICE_NAME' => '${{ secrets.SERVICE_NAME }}',
27
27
  'SERVICE_PROFILE' => '${{ secrets.SERVICE_PROFILE }}',
28
28
  'SERVICE_TOKEN' => '${{ secrets.SERVICE_TOKEN }}',
29
- 'WISHABI_ENVIRONMENT' => '${{ secrets.WISHABI_ENVIRONMENT }}'
30
- })
29
+ 'WISHABI_ENVIRONMENT' => '${{ secrets.WISHABI_ENVIRONMENT }}',
30
+ 'ARTIFACTORY_HOST' => '${{ secrets.ARTIFACTORY_HOST }}',
31
+ 'ARTIFACTORY_PASSWORD' => '${{ secrets.ARTIFACTORY_PASSWORD }}',
32
+ 'ARTIFACTORY_REALM' => '${{ secrets.ARTIFACTORY_REALM }}',
33
+ 'ARTIFACTORY_USER' => '${{ secrets.ARTIFACTORY_USER }}'
34
+ }).merge(config.env)
31
35
 
32
36
  output_hash['jobs'] = {}
33
37
  config.parsed_config['jobs'].each do |name, job|
@@ -50,17 +54,19 @@ module GhaConfig
50
54
  flipp_global['with']['enable_ssh'] = true
51
55
  end
52
56
  job['steps'].unshift(flipp_global)
53
- checkout = {
54
- 'name' => 'Checkout code',
55
- 'uses' => 'actions/checkout@v2'
56
- }
57
- if config.options['use_submodules']
58
- checkout['with'] = {
59
- 'token' => "${{ secrets.FLIPPCIRCLECIPULLER_REPO_TOKEN }}",
60
- 'submodules' => 'recursive'
57
+ unless job['steps'].any? { |s| s['uses'] == 'actions/checkout@v2'}
58
+ checkout = {
59
+ 'name' => 'Checkout code',
60
+ 'uses' => 'actions/checkout@v2'
61
61
  }
62
+ if config.options['use_submodules']
63
+ checkout['with'] = {
64
+ 'token' => "${{ secrets.FLIPPCIRCLECIPULLER_REPO_TOKEN }}",
65
+ 'submodules' => 'recursive'
66
+ }
67
+ end
68
+ job['steps'].unshift(checkout)
62
69
  end
63
- job['steps'].unshift(checkout)
64
70
  job['needs'] = "[#{job['needs'].join(', ')}]" if job['needs'].is_a?(Array)
65
71
  new_job.merge!(job)
66
72
  output_hash['jobs'][name] = new_job
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gha_config
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.20'
4
+ version: '0.24'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Orner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-08-09 00:00:00.000000000 Z
11
+ date: 2022-02-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rubocop