Skip to content

Commit c6c0aaa

Browse files
authored
Merge pull request #3 from OpenVoxProject/fix_7.x
Fix 7.x
2 parents 6b71f71 + b32c912 commit c6c0aaa

File tree

11 files changed

+31
-10
lines changed

11 files changed

+31
-10
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ on:
1414
description: 'A comma-separated list of platforms to build for. Do not include spaces. If not provided, will use the default list of platform supported by OpenVox.'
1515
required: false
1616
type: string
17-
# At the moment, a couple platforms end up timing out at the 6 hour hard limit for runners
18-
# due to using emulation and puppet-runtime taking a long time to compile to begin with.
19-
# We'll build these locally for the time being, so override the the default list of platforms.
20-
# Remove this default once we are using self-hosted runners.
21-
#
22-
# The ones that need to be run locally are amazon-2023-aarch64, fedora-40-aarch64, and el-10-aarch64
23-
default: 'amazon-2-aarch64,amazon-2023-x86_64,debian-10-amd64,debian-11-aarch64,debian-11-amd64,debian-12-aarch64,debian-12-amd64,el-7-x86_64,el-8-aarch64,el-8-x86_64,el-8-ppc64le,el-9-aarch64,el-9-x86_64,el-9-ppc64le,el-10-x86_64,fedora-36-x86_64,fedora-40-x86_64,sles-15-x86_64,ubuntu-18.04-aarch64,ubuntu-18.04-amd64,ubuntu-20.04-aarch64,ubuntu-20.04-amd64,ubuntu-22.04-aarch64,ubuntu-22.04-amd64,ubuntu-24.04-aarch64,ubuntu-24.04-amd64'
2417

2518
jobs:
2619
build:

configs/platforms/amazon-2-aarch64.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
perl-IPC-Cmd
88
readline-devel
99
systemtap-sdt-devel
10+
systemtap-sdt-trace
1011
zlib-devel
1112
]
1213

configs/platforms/amazon-2023-aarch64.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
perl-lib
77
readline-devel
88
systemtap-sdt-devel
9+
systemtap-sdt-dtrace
910
zlib-devel
1011
]
1112

configs/platforms/amazon-2023-x86_64.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
perl-lib
77
readline-devel
88
systemtap-sdt-devel
9+
systemtap-sdt-dtrace
910
zlib-devel
1011
]
1112

configs/platforms/debian-10-amd64.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
libbz2-dev
55
libreadline-dev
66
libselinux1-dev
7-
swig systemtap-sdt-dev
7+
swig
8+
systemtap-sdt-dev
89
zlib1g-dev
910
)
1011
plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"

configs/platforms/el-10-aarch64.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
packages = %w(
55
perl
6+
perl-FindBin
67
perl-Getopt-Long
8+
perl-lib
79
patch
810
swig
911
readline-devel

configs/platforms/el-10-x86_64.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
plat.inherit_from_default
33

44
packages = %w(
5+
perl
6+
perl-FindBin
7+
perl-Getopt-Long
8+
perl-lib
59
libsepol
610
libsepol-devel
711
pkgconfig

configs/platforms/el-9-aarch64.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
packages = %w(
55
perl
6+
perl-FindBin
67
perl-Getopt-Long
8+
perl-lib
79
patch
810
swig
911
readline-devel

configs/platforms/el-9-ppc64le.rb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
platform 'el-9-ppc64le' do |plat|
22
plat.inherit_from_default
3-
plat.provision_with("dnf install -y --allowerasing swig")
3+
packages = %w(
4+
perl
5+
perl-FindBin
6+
perl-Getopt-Long
7+
perl-lib
8+
patch
9+
swig
10+
readline-devel
11+
zlib-devel
12+
systemtap-sdt-devel
13+
)
14+
plat.provision_with("dnf install -y --allowerasing #{packages.join(' ')}")
15+
plat.install_build_dependencies_with "dnf install -y --allowerasing "
416
end

configs/platforms/el-9-x86_64.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
plat.inherit_from_default
33

44
packages = %w(
5+
perl
6+
perl-FindBin
7+
perl-Getopt-Long
8+
perl-lib
59
libsepol
610
libsepol-devel
711
pkgconfig

tasks/upload.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace :vox do
2424
path = "s3://#{bucket}/#{repo}/#{args[:tag]}"
2525
files.each do |f|
2626
puts "Uploading #{File.basename(f)}"
27-
run_command("#{s3} cp #{f} #{path}/#{File.basename(f)} --endpoint-url=#{endpoint}")
27+
run_command("#{s3} cp --debug #{f} #{path}/#{File.basename(f)}")
2828
end
2929
end
3030
end

0 commit comments

Comments
 (0)