(arrow-adbc) branch main updated: ci: include submodules in source archive (#1511)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git


The following commit(s) were added to refs/heads/main by this push:
     new 232ceeb9 ci: include submodules in source archive (#1511)
232ceeb9 is described below

commit 232ceeb953fa4dae12ac5a607c15d94b593e0432
Author: David Li <li...@gmail.com>
AuthorDate: Fri Feb 2 15:41:13 2024 -0500

    ci: include submodules in source archive (#1511)
    
    Fixes #1510.
---
 .github/workflows/packaging.yml   | 4 ++++
 ci/scripts/source_build.sh        | 7 +++++++
 dev/release/rat_exclude_files.txt | 1 +
 3 files changed, 12 insertions(+)

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 72ee4087..cc528a73 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -64,6 +64,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
+          submodules: recursive
 
       # https://github.com/actions/checkout/issues/882
       - name: Update tags
@@ -894,6 +896,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: true
+          submodules: recursive
       - name: Get All Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -937,6 +940,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: true
+          submodules: recursive
       - name: Get All Artifacts
         uses: actions/download-artifact@v3
         with:
diff --git a/ci/scripts/source_build.sh b/ci/scripts/source_build.sh
index 6b9563ef..3d7f9d7b 100755
--- a/ci/scripts/source_build.sh
+++ b/ci/scripts/source_build.sh
@@ -40,6 +40,13 @@ main() {
     rm -rf "${base_name}/"
     git archive "${revision}" --prefix "${base_name}/" | tar xf -
 
+    # Resolve all submodules
+    while read SUBMODULE; do
+        SUBMODULE_REV=$(echo "${SUBMODULE}" | awk '{print $1}')
+        SUBMODULE_PATH=$(echo "${SUBMODULE}" | awk '{print $2}')
+        git -C "${SUBMODULE_PATH}" archive --prefix="${base_name}/${SUBMODULE_PATH}/" "${SUBMODULE_REV}" | tar xf - -C "${source_top_dir}"
+    done < <(git submodule status)
+
     # Resolve all hard and symbolic links
     rm -rf "${base_name}.tmp/"
     mv "${base_name}/" "${base_name}.tmp/"
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
index 4bfa9771..eff896ed 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -30,3 +30,4 @@ r/*/NEWS.md
 r/*/cran-comments.md
 r/*/.Rbuildignore
 r/*/tests/testthat/_snaps/*
+testing/*