use branch specified in payload when CI job is triggered by upstream …

…dispatch [skip ci]
asciidoctor · Jul 13, 2021 · c4872a6 · c4872a6
1 parent 60c6c78
commit c4872a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/upstream-dispatch.yml b/.github/workflows/upstream-dispatch.yml
@@ -28,8 +28,7 @@ jobs:
     - name: Install dependencies
       run: |
         bundle --jobs 3 --retry 3
-        # FIXME: should switch to branch specified in payload
-        bundle exec ruby scripts/switch-to-asciidoctor-head.rb
+        bundle exec ruby scripts/switch-to-asciidoctor-head.rb ${{ github.event.client_payload.branch }}
         rm -f Gemfile.lock
         bundle --jobs 3 --retry 3
     - name: Run tests

diff --git a/scripts/switch-to-asciidoctor-head.rb b/scripts/switch-to-asciidoctor-head.rb
@@ -1,9 +1,10 @@
 require 'fileutils'
 
+branch = ARGV[0] || 'master'
 # NOTE it's necessary to hot patch the installed gem so that RubyGems can find it without Bundler
 asciidoctor_spec = Gem::Specification.find_by_name 'asciidoctor'
 FileUtils.rm_r asciidoctor_spec.gem_dir, secure: true if Dir.exist? asciidoctor_spec.gem_dir
-Process.wait Process.spawn %(git clone --depth=1 https://github.com/asciidoctor/asciidoctor #{File.basename asciidoctor_spec.gem_dir}), chdir: asciidoctor_spec.gems_dir
+Process.wait Process.spawn %(git clone -b #{branch} --depth=1 https://github.com/asciidoctor/asciidoctor #{File.basename asciidoctor_spec.gem_dir}), chdir: asciidoctor_spec.gems_dir
 
 Dir.chdir asciidoctor_spec.gem_dir do
   new_asciidoctor_spec_contents = File.readlines 'asciidoctor.gemspec', mode: 'r:UTF-8'