Skip to content

Commit f04a103

Browse files
authored
Merge pull request #54 from OpenVoxProject/windows_gha
Change windows-2019-x64 -> windows-all-x64 and fix upload task
2 parents beb7a28 + 8e89dcc commit f04a103

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/runtime_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
stat=0
3434
for projfile in configs/projects/[a-z]*.rb; do
35-
for plat in el-8-x86_64 ubuntu-22.04-amd64 windows-2019-x64; do
35+
for plat in el-8-x86_64 ubuntu-22.04-amd64 windows-all-x64; do
3636
proj=$(basename -s .rb "$projfile")
3737
if [[ "$proj" =~ ^pe- && "$plat" =~ ^(windows|osx) ]]; then
3838
echo Skipping ${proj} on ${plat}, PE projects don\'t support Windows or macOS

configs/components/ruby-3.2.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,7 @@
158158
'sles-12-ppc64le',
159159
'solaris-11-sparc',
160160
'solaris-113-sparc',
161-
'windows-2012r2-x64',
162-
'windows-2012r2-x86',
163-
'windows-2019-x64',
164-
'windowsfips-2012r2-x64',
161+
'windows-all-x64',
165162
'windowsfips-2016-x64'
166163
]
167164

configs/platforms/windows-2019-x64.rb renamed to configs/platforms/windows-all-x64.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform "windows-2019-x64" do |plat|
1+
platform "windows-all-x64" do |plat|
22
plat.vmpooler_template "win-2019-x86_64"
33

44
# Not currently used

resources/patches/.DS_Store

6 KB
Binary file not shown.

setup.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

setup.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
$url="https://cygwin.com/setup-x86_64.exe"
2+
$dest="C:\setup-x86_64.exe"
3+
Invoke-WebRequest -Uri $url -OutFile $dest
4+
cmd /c "C:\setup-x86_64.exe -s https://cygwin.osuosl.org -q -P ruby,ruby-devel,gcc-core,make,git,libyaml-devel"

tasks/upload.rake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ namespace :vox do
1616
# Ensure the AWS CLI isn't going to fail with the given parameters
1717
run_command("#{s3} ls s3://#{bucket}/")
1818

19-
prepend = File.directory?('/cygdrive/') ? 'C:/cygwin64/' : ''
20-
files = Dir.glob("#{prepend}#{__dir__}/../output/*#{munged_tag}*#{platform}*")
21-
puts 'No files for the given tag found in the output directory.' if files.empty?
19+
files = Dir.glob("#{__dir__}/../output/*#{munged_tag}*#{platform}*")
20+
abort 'No files for the given tag found in the output directory.' if files.empty?
2221

2322
path = "s3://#{bucket}/#{repo}/#{args[:tag]}"
2423
files.each do |f|
24+
f = `cygpath -m #{f}`.chomp if platform =~ /windows-/
2525
run_command("#{s3} cp #{f} #{path}/#{File.basename(f)}", silent: false)
2626
end
2727
end

0 commit comments

Comments
 (0)