optional steps

Author: robbycochran

.github/workflows/collector-builder.yml

@@ -76,6 +76,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Set up builder ccache
+        if: env.USE_CCACHE
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/builder/.ccache
@@ -84,7 +85,7 @@ jobs:
             builder-ccache-${{ matrix.arch }}-
 
       - name: Set up builder ccache in docker cache
-        if: matrix.arch != 's390x'
+        if: env.USE_CCACHE && matrix.arch != 's390x'
         uses: reproducible-containers/buildkit-cache-dance@v3.1.2
         with:
           cache-map: |
@@ -146,7 +147,7 @@ jobs:
             echo "rhacs_eng_password: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}"
             echo "collector_git_ref: ${{ github.ref }}"
             echo "collector_builder_tag: ${{ env.COLLECTOR_BUILDER_TAG }}"
-            echo "use_ccache: ${USE_CCACHE}"
+            echo "use_ccache: ${{ env.USE_CCACHE }}"
           } > ${{ github.workspace }}/ansible/secrets.yml
 
       - name: Build images

.github/workflows/collector.yml

@@ -47,6 +47,7 @@ jobs:
           submodules: true
 
       - name: Set up ccache
+        if: env.USE_CCACHE
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: ${{ matrix.arch }}
@@ -73,7 +74,7 @@ jobs:
           collector_tag: ${{ inputs.collector-tag }}
           debug_mode: ${{ github.event_name == 'pull_request' }}
           driver_version: ${DRIVER_VERSION}
-          use_ccache: ${USE_CCACHE}
+          use_ccache: ${( env.USE_CCACHE }}
           EOF
 
       - name: Build images
@@ -131,6 +132,7 @@ jobs:
           job-tag: builder
 
       - name: Set up ccache
+        if: env.USE_CCACHE
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/.ccache
@@ -158,7 +160,7 @@ jobs:
           collector_image: ${{ inputs.collector-image }}
           collector_tag: ${{ inputs.collector-tag }}
           debug_mode: ${{ github.event_name == 'pull_request' }}
-          use_ccache: ${USE_CCACHE}
+          use_ccache: ${( env.USE_CCACHE }}
           EOF
 
       - name: Build ${{ matrix.arch }} image

builder/install/install-dependencies.sh

@@ -9,6 +9,9 @@ mkdir -p "${LICENSE_DIR}"
 NPROCS="$(nproc)"
 export NPROCS
 
+# shellcheck source=SCRIPTDIR/versions.sh
+source builder/install/versions.sh
+
 if [ "${USE_CCACHE}" = "true" ]; then
     # build and install ccache
     ./builder/install/ccache.sh
@@ -26,8 +29,6 @@ if [ "${USE_CCACHE}" = "true" ]; then
     ccache -z -d /root/.ccache
 fi
 
-# shellcheck source=SCRIPTDIR/versions.sh
-source builder/install/versions.sh
 for f in builder/install/[0-9][0-9]-*.sh; do
     echo "=== $f ==="
     ./"$f"