From 7766852b57af89e8b5132f7aa85f6697b99583da Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 23 Oct 2024 19:20:10 -0700 Subject: [PATCH 1/5] Add recheck crossbow task --- dev/tasks/r/github.recheck.yml | 30 ++++++++++++++++++++++++++++++ dev/tasks/tasks.yml | 7 +++++++ 2 files changed, 37 insertions(+) create mode 100644 dev/tasks/r/github.recheck.yml diff --git a/dev/tasks/r/github.recheck.yml b/dev/tasks/r/github.recheck.yml new file mode 100644 index 0000000000000..b3bdf8434731f --- /dev/null +++ b/dev/tasks/r/github.recheck.yml @@ -0,0 +1,30 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + recheck: + name: Reverse check {{ which }} dependents + uses: amoeba/recheck/.github/workflows/recheck.yml@v1 # TODO: Point at recheck not amoeba before merging and pin to SHA + with: + which: {{ which }} + subdirectory: r + repository: {{ arrow.github_repo }} + ref: {{ arrow.branch }} diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index fe02fe9ce68b2..0075e816244f0 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -895,6 +895,13 @@ tasks: - r-pkg__bin__macosx__big-sur-arm64__contrib__4.3__arrow_{no_rc_r_version}\.tgz - r-pkg__src__contrib__arrow_{no_rc_r_version}\.tar\.gz +{% for which in ["strong", "most"] %} + r-recheck-{{which}}: + ci: github + template: r/github.recheck.yml + params: + which: {{which}} +{% endfor %} ########################### Release verification ############################ From 4f9a24e7563b83eb1efc997357af6b7cbc13e3d0 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 30 Oct 2024 18:31:00 -0700 Subject: [PATCH 2/5] Switch recheck URL back to official version --- dev/tasks/r/github.recheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/r/github.recheck.yml b/dev/tasks/r/github.recheck.yml index b3bdf8434731f..1584b297f8a5f 100644 --- a/dev/tasks/r/github.recheck.yml +++ b/dev/tasks/r/github.recheck.yml @@ -22,7 +22,7 @@ jobs: recheck: name: Reverse check {{ which }} dependents - uses: amoeba/recheck/.github/workflows/recheck.yml@v1 # TODO: Point at recheck not amoeba before merging and pin to SHA + uses: r-devel/recheck/.github/workflows/recheck.yml@v1 with: which: {{ which }} subdirectory: r From 3ffa5fe9c5effda1e8c4f5ec331e3524182f504b Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 30 Oct 2024 18:32:04 -0700 Subject: [PATCH 3/5] Lock recheck to a specific git sha --- dev/tasks/r/github.recheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/r/github.recheck.yml b/dev/tasks/r/github.recheck.yml index 1584b297f8a5f..5f0095fa22126 100644 --- a/dev/tasks/r/github.recheck.yml +++ b/dev/tasks/r/github.recheck.yml @@ -22,7 +22,7 @@ jobs: recheck: name: Reverse check {{ which }} dependents - uses: r-devel/recheck/.github/workflows/recheck.yml@v1 + uses: r-devel/recheck/.github/workflows/recheck.yml@9fe04de60ebeadd505b8d76223a346617ccca836 with: which: {{ which }} subdirectory: r From a077cc5b3b121a98d1bf0650415892f67c6d34ce Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 31 Oct 2024 10:40:02 -0700 Subject: [PATCH 4/5] Add r-recheck-most to r group --- dev/tasks/tasks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 0075e816244f0..45c928b80c262 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -89,6 +89,7 @@ groups: r: - test*-r-* - r-binary-packages + - r-recheck-most ruby: - test-*ruby* From 5d3e2383e99c5417b07f2f2cb46d34c0c48be449 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Fri, 1 Nov 2024 07:45:44 -0700 Subject: [PATCH 5/5] Add docs for recheck tasks --- dev/tasks/tasks.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 45c928b80c262..dea1d33cc80ee 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -897,6 +897,13 @@ tasks: - r-pkg__src__contrib__arrow_{no_rc_r_version}\.tar\.gz {% for which in ["strong", "most"] %} + # strong and most used here are defined by ?tools::package_dependencies as: + # + # strong: Depends, Imports, LinkingTo + # most: Depends, Imports, LinkingTo, Suggests + # + # So the key difference between strong and most is whether you want to expand + # the reverse dependency checking to Suggests (most) or not. r-recheck-{{which}}: ci: github template: r/github.recheck.yml