Skip to content

Change windows-2019-x64 -> windows-all-x64 and fix upload task #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 3, 2025
Merged

Change windows-2019-x64 -> windows-all-x64 and fix upload task #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5bf5a3
Change windows-2019-x64 -> windows-all-x64
nmburgan Sep 1, 2025
c1a3b47
Fail upload task if it can't find files to upload and fix for Windows
nmburgan Sep 2, 2025
8e89dcc
Make setup.bat -> setup.ps1 and download Cygwin
nmburgan Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/runtime_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: |
stat=0
for projfile in configs/projects/[a-z]*.rb; do
for plat in el-8-x86_64 ubuntu-22.04-amd64 windows-2019-x64; do
for plat in el-8-x86_64 ubuntu-22.04-amd64 windows-all-x64; do
proj=$(basename -s .rb "$projfile")
if [[ "$proj" =~ ^pe- && "$plat" =~ ^(windows|osx) ]]; then
echo Skipping ${proj} on ${plat}, PE projects don\'t support Windows or macOS
Expand Down
5 changes: 1 addition & 4 deletions configs/components/ruby-3.2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,7 @@
'sles-12-ppc64le',
'solaris-11-sparc',
'solaris-113-sparc',
'windows-2012r2-x64',
'windows-2012r2-x86',
'windows-2019-x64',
'windowsfips-2012r2-x64',
'windows-all-x64',
'windowsfips-2016-x64'
]

Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/windows-2019-x64.rb → configs/platforms/windows-all-x64.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform "windows-2019-x64" do |plat|
platform "windows-all-x64" do |plat|
plat.vmpooler_template "win-2019-x86_64"

# Not currently used
Expand Down
Binary file added resources/patches/.DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion setup.bat
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$url="https://cygwin.com/setup-x86_64.exe"
$dest="C:\setup-x86_64.exe"
Invoke-WebRequest -Uri $url -OutFile $dest
cmd /c "C:\setup-x86_64.exe -s https://cygwin.osuosl.org -q -P ruby,ruby-devel,gcc-core,make,git,libyaml-devel"
6 changes: 3 additions & 3 deletions tasks/upload.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ namespace :vox do
# Ensure the AWS CLI isn't going to fail with the given parameters
run_command("#{s3} ls s3://#{bucket}/")

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

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