packaging 0.110.1 → 0.112.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/packaging/paths.rb +1 -1
- data/lib/packaging/platforms.rb +13 -2
- data/spec/lib/packaging/platforms_spec.rb +2 -2
- metadata +17 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e4edacd0d8bab96ae4a5ee44c23a120819524f0eb4faca14954f08e2f71a64ea
|
4
|
+
data.tar.gz: a608f83cb2eeabc40b366a792f5aea5ac9b05b3cece5db5939ee33e8fc725600
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 322dd7199e20f7840d6cd42ad936944955ec6b1399b3f573fc9c60cea3aea390f5609b981931eea9c8437dfeb8ab4d855fbd7f33b9f3a989307a0947b90075c5
|
7
|
+
data.tar.gz: 91363da9e94bf818c67a3d4d073327f9c9878d7b20492e9bdc2cb3f95473b1023f7dc9f7758ab381fd08560b33a20b626361ac50f314882a53e5c5f459d8aaaa
|
data/lib/packaging/paths.rb
CHANGED
@@ -365,7 +365,7 @@ module Pkg::Paths
|
|
365
365
|
|
366
366
|
#for ubuntu-20.04-aarch64, debian package architecture is arm64
|
367
367
|
def package_arch(platform, arch)
|
368
|
-
if
|
368
|
+
if %w[debian ubuntu].include?(platform) && arch == 'aarch64'
|
369
369
|
return 'arm64'
|
370
370
|
end
|
371
371
|
arch
|
data/lib/packaging/platforms.rb
CHANGED
@@ -27,6 +27,17 @@ module Pkg
|
|
27
27
|
},
|
28
28
|
},
|
29
29
|
|
30
|
+
'amazon' => {
|
31
|
+
'2023' => {
|
32
|
+
architectures: ['x86_64', 'aarch64'],
|
33
|
+
source_architecture: 'SRPMS',
|
34
|
+
package_format: 'rpm',
|
35
|
+
source_package_formats: ['src.rpm'],
|
36
|
+
signature_format: 'v4',
|
37
|
+
repo: true,
|
38
|
+
},
|
39
|
+
},
|
40
|
+
|
30
41
|
'debian' => {
|
31
42
|
'10' => {
|
32
43
|
codename: 'buster',
|
@@ -38,7 +49,7 @@ module Pkg
|
|
38
49
|
},
|
39
50
|
'11' => {
|
40
51
|
codename: 'bullseye',
|
41
|
-
architectures: ['amd64'],
|
52
|
+
architectures: ['amd64', 'aarch64'],
|
42
53
|
source_architecture: 'source',
|
43
54
|
package_format: 'deb',
|
44
55
|
source_package_formats: DEBIAN_SOURCE_FORMATS,
|
@@ -72,7 +83,7 @@ module Pkg
|
|
72
83
|
repo: true,
|
73
84
|
},
|
74
85
|
'9' => {
|
75
|
-
architectures: ['x86_64'],
|
86
|
+
architectures: ['x86_64', 'aarch64'],
|
76
87
|
source_architecture: 'SRPMS',
|
77
88
|
package_format: 'rpm',
|
78
89
|
source_package_formats: ['src.rpm'],
|
@@ -4,7 +4,7 @@ describe 'Pkg::Platforms' do
|
|
4
4
|
describe '#by_package_format' do
|
5
5
|
it 'should return an array of platforms that use a given format' do
|
6
6
|
deb_platforms = ['debian', 'ubuntu']
|
7
|
-
rpm_platforms = ['aix', 'el', 'fedora', 'redhatfips', 'sles']
|
7
|
+
rpm_platforms = ['aix', 'amazon', 'el', 'fedora', 'redhatfips', 'sles']
|
8
8
|
expect(Pkg::Platforms.by_package_format('deb')).to match_array(deb_platforms)
|
9
9
|
expect(Pkg::Platforms.by_package_format('rpm')).to match_array(rpm_platforms)
|
10
10
|
end
|
@@ -19,7 +19,7 @@ describe 'Pkg::Platforms' do
|
|
19
19
|
|
20
20
|
describe '#supported_platforms' do
|
21
21
|
it 'should return all supported platforms' do
|
22
|
-
platforms = ['aix', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
|
22
|
+
platforms = ['aix', 'amazon', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
|
23
23
|
expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
|
24
24
|
end
|
25
25
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: packaging
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.112.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet By Perforce
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-11-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: debug
|
@@ -308,27 +308,27 @@ specification_version: 4
|
|
308
308
|
summary: Puppet by Perforce packaging automation
|
309
309
|
test_files:
|
310
310
|
- spec/lib/packaging_spec.rb
|
311
|
-
- spec/lib/packaging/tar_spec.rb
|
312
|
-
- spec/lib/packaging/repo_spec.rb
|
313
|
-
- spec/lib/packaging/sign_spec.rb
|
314
|
-
- spec/lib/packaging/deb/repo_spec.rb
|
315
|
-
- spec/lib/packaging/artifactory_spec.rb
|
316
311
|
- spec/lib/packaging/config_spec.rb
|
317
|
-
- spec/lib/packaging/
|
312
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
313
|
+
- spec/lib/packaging/sign_spec.rb
|
314
|
+
- spec/lib/packaging/paths_spec.rb
|
315
|
+
- spec/lib/packaging/repo_spec.rb
|
318
316
|
- spec/lib/packaging/deb_spec.rb
|
319
|
-
- spec/lib/packaging/
|
320
|
-
- spec/lib/packaging/
|
321
|
-
- spec/lib/packaging/
|
322
|
-
- spec/lib/packaging/util/misc_spec.rb
|
317
|
+
- spec/lib/packaging/platforms_spec.rb
|
318
|
+
- spec/lib/packaging/tar_spec.rb
|
319
|
+
- spec/lib/packaging/artifactory_spec.rb
|
323
320
|
- spec/lib/packaging/util/git_spec.rb
|
324
|
-
- spec/lib/packaging/util/git_tag_spec.rb
|
325
|
-
- spec/lib/packaging/util/execution_spec.rb
|
326
321
|
- spec/lib/packaging/util/os_spec.rb
|
327
|
-
- spec/lib/packaging/util/
|
322
|
+
- spec/lib/packaging/util/jenkins_spec.rb
|
323
|
+
- spec/lib/packaging/util/rake_utils_spec.rb
|
324
|
+
- spec/lib/packaging/util/execution_spec.rb
|
325
|
+
- spec/lib/packaging/util/file_spec.rb
|
328
326
|
- spec/lib/packaging/util/version_spec.rb
|
329
327
|
- spec/lib/packaging/util/net_spec.rb
|
330
328
|
- spec/lib/packaging/util/ship_spec.rb
|
331
|
-
- spec/lib/packaging/util/
|
329
|
+
- spec/lib/packaging/util/gpg_spec.rb
|
330
|
+
- spec/lib/packaging/util/git_tag_spec.rb
|
331
|
+
- spec/lib/packaging/util/misc_spec.rb
|
332
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
332
333
|
- spec/lib/packaging/retrieve_spec.rb
|
333
|
-
- spec/lib/packaging/paths_spec.rb
|
334
334
|
- spec/lib/packaging/gem_spec.rb
|