GHA: Install/upgrade git in containers

For the container we need to install git before the checkout actions.

So add that to the list and move the setup before the checkout step.

Author: Flamefire

.github/workflows/unit-tests.yml

@@ -117,6 +117,36 @@ jobs:
         shell: bash
 
     steps:
+      - name: Install system packages
+        run: |
+          if [[ "${{runner.os}}" =~ macOS ]]; then
+            echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
+            echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
+            brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc
+            echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
+            # Use the latest (last folder)
+            BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
+            echo "Choosen Boost: $BOOST_ROOT"
+            [[ -n "$BOOST_ROOT" ]] || exit 1
+            ls "$BOOST_ROOT/include"
+            echo "CMake config files:"
+            find "$BOOST_ROOT"/lib/cmake -type f
+            echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
+          else
+            if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
+              apt-get -o Acquire::Retries=5 update
+              apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install sudo software-properties-common git
+            fi
+            compiler=${{matrix.compiler}}
+            compiler=${compiler/gcc-/g++-}
+            if [[ "${{matrix.init_llvm}}" == "true" ]]; then
+              clang_version=${compiler#clang-*}
+              wget -qO- "https://apt.llvm.org/llvm.sh" | sudo bash -s -- "${clang_version}"
+            fi
+            sudo apt-get -o Acquire::Retries=5 update
+            sudo apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install gettext libsdl2-dev libsdl2-mixer-dev libcurl4-openssl-dev libbz2-dev libminiupnpc-dev liblua5.2-dev $compiler
+          fi
+
       - name: Setup env and configure flags
         run: |
           echo "DEPS_DIR=${{runner.temp}}/.cache" >> $GITHUB_ENV
@@ -160,36 +190,6 @@ jobs:
           path: ${{env.DEPS_DIR}}
           key: ${{matrix.os}}-${{env.BOOST_VERSION}}
 
-      - name: Install system packages
-        run: |
-          if [[ "${{runner.os}}" =~ macOS ]]; then
-            echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
-            echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
-            brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc
-            echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
-            # Use the latest (last folder)
-            BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
-            echo "Choosen Boost: $BOOST_ROOT"
-            [[ -n "$BOOST_ROOT" ]] || exit 1
-            ls "$BOOST_ROOT/include"
-            echo "CMake config files:"
-            find "$BOOST_ROOT"/lib/cmake -type f
-            echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
-          else
-            if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
-              apt-get -o Acquire::Retries=5 update
-              apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install sudo software-properties-common
-            fi
-            compiler=${{matrix.compiler}}
-            compiler=${compiler/gcc-/g++-}
-            if [[ "${{matrix.init_llvm}}" == "true" ]]; then
-              clang_version=${compiler#clang-*}
-              wget -qO- "https://apt.llvm.org/llvm.sh" | sudo bash -s -- "${clang_version}"
-            fi
-            sudo apt-get -o Acquire::Retries=5 update
-            sudo apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install gettext libsdl2-dev libsdl2-mixer-dev libcurl4-openssl-dev libbz2-dev libminiupnpc-dev liblua5.2-dev $compiler
-          fi
-
       - name: Setup CCache
         uses: hendrikmuhs/ccache-action@v1
         with: