Merge pull request jamulussoftware#2284 from hoffie/cache-autobuild-deps

Autobuild: Refactor & use actions/cache

Author: hoffie

.github/workflows/autobuild.yml

@@ -169,6 +169,38 @@ jobs:
         with:
           submodules:               true
 
+      # Enable caching of downloaded dependencies
+      - name:                       "Cache Mac dependencies"
+        if:                         ${{ matrix.config.target_os == 'macos' }}
+        uses:                       actions/cache@v2
+        with:
+          path: |
+            /usr/local/opt/qt
+            ~/Library/Caches/pip
+          key:                      ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/mac/artifacts/autobuild_mac_1_prepare.sh', 'autobuild/mac/codeQL/autobuild_mac_1_prepare.sh') }}-${{ matrix.config.cmd1_prebuild }}
+
+      - name:                       "Cache Windows dependencies"
+        if:                         ${{ matrix.config.target_os == 'windows' }}
+        uses:                       actions/cache@v2
+        with:
+          path: |
+            C:\Qt
+            C:\ChocoCache
+            ~\AppData\Local\pip\Cache
+            ~\windows\NSIS
+            ~\windows\ASIOSDK2
+          key:                      ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1', 'windows/deploy_windows.ps1') }}-${{ matrix.config.cmd1_prebuild }}
+
+      - name:                       "Cache Android dependencies"
+        if:                         ${{ matrix.config.target_os == 'android' }}
+        uses:                       actions/cache@v2
+        with:
+          path: |
+            /opt/Qt
+            /opt/android/android-sdk
+            /opt/android/android-ndk
+          key:                      ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/android/autobuild_apk_1_prepare.sh', 'autobuild/android/install-qt.sh') }}-${{ matrix.config.cmd1_prebuild }}
+
       # Prepare (install QT & dependencies)
       - name:                       "Prepare for ${{ matrix.config.config_name }}"
         if:                         ${{ matrix.config.cmd1_prebuild }}

autobuild/android/autobuild_apk_1_prepare.sh

@@ -34,18 +34,26 @@ export ANDROID_NDK_HOST="linux-x86_64"
 export ANDROID_SDKMANAGER="${COMMANDLINETOOLS_DIR}/bin/sdkmanager"
 
 # paths for Android SDK
-mkdir -p "${COMMANDLINETOOLS_DIR}"
 mkdir -p "${ANDROID_SDK_ROOT}"/build-tools/latest/
 
 # Install Android sdk
-wget -q -O downloadfile https://dl.google.com/android/repository/commandlinetools-linux-${COMMANDLINETOOLS_VERSION}_latest.zip
-unzip -q downloadfile
-mv cmdline-tools/* "${COMMANDLINETOOLS_DIR}"
+if [[ -d "${COMMANDLINETOOLS_DIR}" ]]; then
+    echo "Using commandlinetools installation from previous run (actions/cache)"
+else
+    mkdir -p "${COMMANDLINETOOLS_DIR}"
+    wget -q -O downloadfile https://dl.google.com/android/repository/commandlinetools-linux-${COMMANDLINETOOLS_VERSION}_latest.zip
+    unzip -q downloadfile
+    mv cmdline-tools/* "${COMMANDLINETOOLS_DIR}"
+fi
 
 # Install Android ndk
-wget -q -O downloadfile https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip
-unzip -q downloadfile
-mv android-ndk-${ANDROID_NDK_VERSION} "${ANDROID_NDK_ROOT}"
+if [[ -d "${ANDROID_NDK_ROOT}" ]]; then
+    echo "Using NDK installation from previous run (actions/cache)"
+else
+    wget -q -O downloadfile https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip
+    unzip -q downloadfile
+    mv android-ndk-${ANDROID_NDK_VERSION} "${ANDROID_NDK_ROOT}"
+fi
 
 # Install Android SDK
 yes | "${ANDROID_SDKMANAGER}" --licenses

autobuild/mac/artifacts/autobuild_mac_1_prepare.sh

@@ -15,9 +15,13 @@ AQTINSTALL_VERSION=2.0.5
 ###  PROCEDURE  ###
 ###################
 
-echo "Install dependencies..."
-python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}"
-python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop ${QT_VER}
+if [[ -d "${QT_DIR}" ]]; then
+    echo "Using Qt installation from previous run (actions/cache)"
+else
+    echo "Install dependencies..."
+    python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}"
+    python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop ${QT_VER}
+fi
 
 # Add the qt binaries to the PATH.
 # The clang_64 entry can be dropped when Qt <6.2 compatibility is no longer needed.

autobuild/mac/codeQL/autobuild_mac_1_prepare.sh

@@ -15,9 +15,13 @@ AQTINSTALL_VERSION=2.0.5
 ###  PROCEDURE  ###
 ###################
 
-echo "Install dependencies..."
-python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}"
-python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop ${QT_VER}
+if [[ -d "${QT_DIR}" ]]; then
+    echo "Using Qt installation from previous run (actions/cache)"
+else
+    echo "Install dependencies..."
+    python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}"
+    python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop ${QT_VER}
+fi
 
 # Add the qt binaries to the PATH.
 # The clang_64 entry can be dropped when Qt <6.2 compatibility is no longer needed.

autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1

@@ -20,34 +20,42 @@ $ErrorActionPreference = "Stop"
 ###################
 
 $QtDir = 'C:\Qt'
+$ChocoCacheDir = 'C:\ChocoCache'
 $Qt32Version = "5.15.2"
 $Qt64Version = "5.15.2"
 $AqtinstallVersion = "2.0.5"
 $JackVersion = "1.9.17"
 $MsvcVersion = "2019"
 
-echo "Install Qt..."
-# Install Qt
-pip install "aqtinstall==$AqtinstallVersion"
-if ( !$? )
+if ( Test-Path -Path $QtDir )
 {
-		throw "pip install aqtinstall failed with exit code $LastExitCode"
+    echo "Using Qt installation from previous run (actions/cache)"
 }
-
-echo "Get Qt 64 bit..."
-# intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
-aqt install-qt --outputdir "${QtDir}" windows desktop "${Qt64Version}" "win64_msvc${MsvcVersion}_64"
-if ( !$? )
+else
 {
-		throw "64bit Qt installation failed with exit code $LastExitCode"
-}
+    echo "Install Qt..."
+    # Install Qt
+    pip install "aqtinstall==$AqtinstallVersion"
+    if ( !$? )
+    {
+        throw "pip install aqtinstall failed with exit code $LastExitCode"
+    }
 
-echo "Get Qt 32 bit..."
-# intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
-aqt install-qt --outputdir "${QtDir}" windows desktop "${Qt32Version}" "win32_msvc${MsvcVersion}"
-if ( !$? )
-{
-		throw "32bit Qt installation failed with exit code $LastExitCode"
+    echo "Get Qt 64 bit..."
+    # intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
+    aqt install-qt --outputdir "${QtDir}" windows desktop "${Qt64Version}" "win64_msvc${MsvcVersion}_64"
+    if ( !$? )
+    {
+        throw "64bit Qt installation failed with exit code $LastExitCode"
+    }
+
+    echo "Get Qt 32 bit..."
+    # intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
+    aqt install-qt --outputdir "${QtDir}" windows desktop "${Qt32Version}" "win32_msvc${MsvcVersion}"
+    if ( !$? )
+    {
+            throw "32bit Qt installation failed with exit code $LastExitCode"
+    }
 }
 
 
@@ -57,6 +65,8 @@ if ( !$? )
 
 if ($BuildOption -Eq "jackonwindows")
 {
+    choco config set cacheLocation $ChocoCacheDir
+
     echo "Install JACK2 64-bit..."
     # Install JACK2 64-bit
     choco install --no-progress -y jack --version "${JackVersion}"