Merge pull request #403 from mcorino/develop

fix automatic Cirrus release builds

Author: mcorino

tools/scripts/cirrus/cirrus-release.yml

@@ -4,6 +4,7 @@
 env:
   WXRUBY_TEST_EXCLUDE: 'test_intl:test_media_ctrl'
   GITHUB_TOKEN: ENCRYPTED[!d9f8c8d7b73dd043f3d5f287caaedad4530509c511cfb4aaf9e4582b2f6b4e3962fea59108f1dc396774e7887452fa85!]
+  CIRRUS_TAG: '#{GH_RELEASE_TAG}'
 
 release_task:
   timeout_in: 90m

tools/scripts/cirrus/start_release_tasks.rb

@@ -8,7 +8,7 @@
 
 $release = false # actual release or manual test run
 $refname = 'master'
-$task_cfg = File.join(__dir__, 'cirrus-release.yml')
+$task_cfg = File.read(File.join(__dir__, 'cirrus-release.yml'))
 until ARGV.empty?
   arg = ARGV.shift
   case arg
@@ -21,6 +21,8 @@
   end
 end
 
+$task_cfg.sub('#{GH_RELEASE_TAG}', $refname)
+
 # for an actual release use the master branch and get the actual sha for the release tag
 if $release
   $branch = 'master'
@@ -47,7 +49,7 @@
     input: {
       repositoryId: "#{$repository_id}",
       branch: $branch,
-      configOverride: File.read($task_cfg),
+      configOverride: $task_cfg,
       clientMutationId: "wxRuby3"
     }
   }

tools/scripts/cirrus/test-wxruby3-release.sh

@@ -9,6 +9,8 @@ if [ "$CIRRUS_TAG" == "" ]; then
   fi
 fi
 
+echo "Testing wxRuby3 $CIRRUS_TAG"
+
 gem sources --add "https://mcorino:$GITHUB_TOKEN@rubygems.pkg.github.com/mcorino/"
 
 WXRUBY_VERSION=${CIRRUS_TAG/#v/}

tools/scripts/cirrus/upload-release-pkg.rb

@@ -9,8 +9,8 @@
   exit(1)
 end
 
-$CIRRUS_RELEASE = ENV['CIRRUS_RELEASE'] || ''
-if $CIRRUS_RELEASE.empty?
+$CIRRUS_TAG = ENV['CIRRUS_TAG'] || ''
+if $CIRRUS_TAG.empty?
   uri = URI('https://api.github.com/repos/mcorino/wxruby3/releases/latest')
   headers = {
     'Accept' => 'application/vnd.github+json',
@@ -26,7 +26,7 @@
                   end
   if rest_response.code.to_i == 200
     data = JSON.parse!(rest_response.body)
-    $CIRRUS_RELEASE = data['id']
+    $CIRRUS_TAG = data['id']
   else
     $stderr.puts "Cannot determine latest release [#{rest_response}]!"
     exit(1)
@@ -36,8 +36,8 @@
 file_content_type="application/octet-stream"
 Dir.glob(File.join('pkg', '*.pkg')).each do |fpath|
   name = File.basename(fpath)
-  url_to_upload = "https://uploads.github.com/repos/mcorino/wxruby3/releases/#{$CIRRUS_RELEASE}/assets?name=#{name}"
-  puts "Uploading #{fpath} for release #{$CIRRUS_RELEASE} to #{url_to_upload}..."
+  url_to_upload = "https://uploads.github.com/repos/mcorino/wxruby3/releases/#{$CIRRUS_TAG}/assets?name=#{name}"
+  puts "Uploading #{fpath} for release #{$CIRRUS_TAG} to #{url_to_upload}..."
   cmd = "curl -L -X POST -H \"Accept: application/vnd.github+json\" " +
                           "-H \"Authorization: token #{$GITHUB_TOKEN}\" " +
                           "-H \"X-GitHub-Api-Version: 2022-11-28\" " +
@@ -48,8 +48,8 @@
   if rc
     name = File.basename(name, '.*')+'.sha'
     fpath = File.join(File.dirname(fpath), name)
-    url_to_upload = "https://uploads.github.com/repos/mcorino/wxruby3/releases/#{$CIRRUS_RELEASE}/assets?name=#{name}"
-    puts "Uploading #{fpath} for release #{$CIRRUS_RELEASE} to #{url_to_upload}..."
+    url_to_upload = "https://uploads.github.com/repos/mcorino/wxruby3/releases/#{$CIRRUS_TAG}/assets?name=#{name}"
+    puts "Uploading #{fpath} for release #{$CIRRUS_TAG} to #{url_to_upload}..."
     cmd = "curl -L -X POST -H \"Accept: application/vnd.github+json\" " +
       "-H \"Authorization: token #{$GITHUB_TOKEN}\" " +
       "-H \"X-GitHub-Api-Version: 2022-11-28\" " +