From 22f60b3ea568bee0f7fe2f996a0382fde443427d Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 2 Jan 2025 10:41:40 -0800 Subject: [PATCH 1/3] Remove gemfury pins --- dev/tasks/macros.jinja | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index 221d2a48b87d..dded9492f0c4 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -158,14 +158,12 @@ env: - name: Install gemfury client on ARM self-hosted if: runner.arch != 'X64' run: | - # GH-36692: Pin gemfury due to wrong faraday dependency declaration. - gem install --user-install gemfury -v 0.12.0 + gem install --user-install gemfury ruby -r rubygems -e 'puts("#{Gem.user_dir}/bin")' >> $GITHUB_PATH - name: Install gemfury client if: runner.arch == 'X64' run: | - # GH-36692: Pin gemfury due to wrong faraday dependency declaration. - gem install gemfury -v 0.12.0 + gem install gemfury - name: Upload package to Gemfury shell: bash run: | From b0a329fc72258e61243e7e1350e78633a0b705ce Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 2 Jan 2025 10:57:22 -0800 Subject: [PATCH 2/3] donotmerge Just testing in this PR, don't merge with this change. --- dev/tasks/macros.jinja | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index dded9492f0c4..fcae95151054 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -144,7 +144,6 @@ env: {% endmacro %} {%- macro github_upload_gemfury(pattern) -%} - {%- if arrow.is_default_branch() -%} - name: Set up Ruby by apt if: runner.os == 'Linux' && runner.arch != 'X64' run: | @@ -178,7 +177,6 @@ env: env: CROSSBOW_GEMFURY_TOKEN: {{ '${{ secrets.CROSSBOW_GEMFURY_TOKEN }}' }} CROSSBOW_GEMFURY_ORG: {{ '${{ secrets.CROSSBOW_GEMFURY_ORG }}' }} - {% endif %} {% endmacro %} {%- macro github_upload_wheel_scientific_python(pattern) -%} From 92e01e186d9036d0702b20971dfdc24901fbcb76 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 2 Jan 2025 11:19:13 -0800 Subject: [PATCH 3/3] Revert "donotmerge" This reverts commit b0a329fc72258e61243e7e1350e78633a0b705ce. --- dev/tasks/macros.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index fcae95151054..dded9492f0c4 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -144,6 +144,7 @@ env: {% endmacro %} {%- macro github_upload_gemfury(pattern) -%} + {%- if arrow.is_default_branch() -%} - name: Set up Ruby by apt if: runner.os == 'Linux' && runner.arch != 'X64' run: | @@ -177,6 +178,7 @@ env: env: CROSSBOW_GEMFURY_TOKEN: {{ '${{ secrets.CROSSBOW_GEMFURY_TOKEN }}' }} CROSSBOW_GEMFURY_ORG: {{ '${{ secrets.CROSSBOW_GEMFURY_ORG }}' }} + {% endif %} {% endmacro %} {%- macro github_upload_wheel_scientific_python(pattern) -%}