ARROW-15133: [CI] Remove util_checkout.sh and util_cleanup.sh scripts

- `ci/scripts/util_checkout.sh` was used to checkout submodules because `actions/checkout@v2` has removed support for that, but they have restored it since. - `ci/scripts/util_cleanup.sh` was used to free up disk space on github actions runners, because at that time it was limited to 7GB, from a recent run it looks like the linux runners now have 32GB free space so we can try to disable the cleanup step sparing almost a minute of build time Closes apache#11974 from kszucs/checkout Authored-by: Krisztián Szűcs <[email protected]> Signed-off-by: Jonathan Keane <[email protected]>
ClickHouse · Dec 16, 2021 · 049118f · 049118f
1 parent 81c8a0e
commit 049118f
Show file tree

Hide file tree

Showing 31 changed files with 89 additions and 431 deletions.
diff --git a/.github/workflows/archery.yml b/.github/workflows/archery.yml
@@ -50,8 +50,6 @@ jobs:
       - name: Git Fixup
         shell: bash
         run: git branch master origin/master || true
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Setup Python
         uses: actions/setup-python@v1
         with:

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -70,10 +70,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
+          submodules: recursive
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:
@@ -108,6 +105,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+          submodules: recursive
       - name: Check CMake presets
         run: |
           cd cpp
@@ -148,9 +146,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
+          submodules: recursive
       - name: Install Dependencies
         shell: bash
         run: |
@@ -241,13 +237,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
+          submodules: recursive
       - name: Build
         shell: bash
-        run: |
-          ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
+        run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
       - name: Test
         shell: bash
         run: ci/scripts/cpp_test.sh $(pwd) $(pwd)/build
@@ -305,17 +298,14 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
+          submodules: recursive
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW${{ matrix.mingw-n-bits }}
           update: true
       - name: Setup MSYS2
         shell: msys2 {0}
-        run: |
-          ci/scripts/msys2_setup.sh cpp
+        run: ci/scripts/msys2_setup.sh cpp
       - name: Cache ccache
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -53,9 +53,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Install Source Link
         shell: bash
         run: dotnet tool install --global sourcelink
@@ -84,9 +81,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Install Source Link
         run: dotnet tool install --global sourcelink
       - name: Build
@@ -117,9 +111,6 @@ jobs:
       - name: Install Source Link
         shell: bash
         run: dotnet tool install --global sourcelink
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Build
         shell: bash
         run: ci/scripts/csharp_build.sh $(pwd)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -41,10 +41,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
@@ -75,9 +71,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Install Python
         uses: actions/setup-python@v1
         with:
@@ -96,5 +89,4 @@ jobs:
           ci/scripts/release_test.sh $(pwd)
       - name: Run Merge Script Test
         shell: bash
-        run: |
-          pytest -v dev/test_merge_arrow_pr.py
+        run: pytest -v dev/test_merge_arrow_pr.py
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -53,10 +53,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -58,10 +58,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
@@ -91,10 +87,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
@@ -125,10 +117,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
@@ -160,9 +148,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Build
         shell: bash
         run: ci/scripts/go_build.sh .
@@ -188,9 +173,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Build
         shell: bash
         run: ci/scripts/go_build.sh .
@@ -218,9 +200,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Brew Install Arrow
         shell: bash
         run: brew install apache-arrow
@@ -257,9 +236,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW${{ matrix.mingw-n-bits }}
@@ -273,7 +249,7 @@ jobs:
         run: |
           echo "CGO_CPPFLAGS=-I$(cygpath --windows ${MINGW_PREFIX}/include)" >> $GITHUB_ENV
           echo "CGO_LDFLAGS=-g -O2 -L$(cygpath --windows ${MINGW_PREFIX}/lib) -L$(cygpath --windows ${MINGW_PREFIX}/bin)" >> $GITHUB_ENV
-          echo "GOROOT=$(cygpath --windows ${MINGW_PREFIX}/lib/go)" >> $GITHUB_ENV          
+          echo "GOROOT=$(cygpath --windows ${MINGW_PREFIX}/lib/go)" >> $GITHUB_ENV
           echo "GOPATH=$(cygpath --windows ${HOME}/gopath)" >> $GITHUB_ENV
           mkdir -p $(cygpath --windows ${HOME}/gopath)
           echo "MINGW_PREFIX=$(cygpath --windows ${MINGW_PREFIX})" >> $GITHUB_ENV

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -62,15 +62,12 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
+          submodules: recursive
       - name: Checkout Arrow Rust
         uses: actions/checkout@v2
         with:
           repository: apache/arrow-rs
           path: rust
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -64,12 +64,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        shell: bash
-        run: ci/scripts/util_cleanup.sh
+          submodules: recursive
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:
@@ -107,9 +102,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
+          submodules: recursive
       - name: Build
         shell: bash
         run: ci/scripts/java_build.sh $(pwd) $(pwd)/build

diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml
@@ -56,10 +56,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
+          submodules: recursive
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:
@@ -89,10 +86,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
+          submodules: recursive
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -51,10 +51,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
@@ -85,9 +81,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
       - name: Install NodeJS
         uses: actions/setup-node@v1
         with:
@@ -111,7 +104,7 @@ jobs:
       - name: Checkout Arrow
         uses: actions/checkout@v1
         with:
-          submodules: true
+          fetch-depth: 0
       - name: Install NodeJS
         uses: actions/setup-node@v1
         with:

diff --git a/.github/workflows/matlab.yml b/.github/workflows/matlab.yml
@@ -45,8 +45,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
       - name: Install ninja-build
         run: sudo apt-get install ninja-build
       - name: Install MATLAB

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -89,10 +89,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
+          submodules: recursive
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:
@@ -143,9 +140,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
+          submodules: recursive
       - name: Install Dependencies
         shell: bash
         run: |

diff --git a/.github/workflows/r-without-arrow.yml b/.github/workflows/r-without-arrow.yml
@@ -53,10 +53,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -67,10 +67,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with:
@@ -129,10 +125,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        run: ci/scripts/util_checkout.sh
-      - name: Free Up Disk Space
-        run: ci/scripts/util_cleanup.sh
       - name: Cache Docker Volumes
         uses: actions/cache@v2
         with: