[lmi-commits] [lmi] master c4a85fc 06/28: Install the required packages before checkout in the CI job

[Greg Chicares]

branch: master
commit c4a85fc556c015144dfeb8256585628bc0a0fb35
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Install the required packages before checkout in the CI job
    
    When using the slim Debian container, we need to install Git before
    checking the sources out, as it's not available in the base image.
    
    This commit is best viewed using --color-moved option.
---
 .github/workflows/ci.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35f2ad0..792cb7b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,27 +45,6 @@ jobs:
       LMI_TRIPLET: ${{ matrix.triplet || 'x86_64-pc-linux-gnu' }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Install Wine
-        if: matrix.mingw
-        run: |
-          sudo dpkg --add-architecture i386
-
-          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo 
apt-key add -
-          sudo add-apt-repository "deb 
https://dl.winehq.org/wine-builds/debian $(lsb_release -cs) main"
-
-          sudo apt-get -qq update
-
-          # Workaround the issue with Wine.
-          sudo apt-get -qq install libasound2-plugins:i386 libgphoto2-6:i386
-          sudo apt-get -qq install wine-stable-i386
-          sudo apt-get -qq install wine-stable
-          sudo apt-get -qq install --install-recommends winehq-stable
-
       - name: Install required packages
         run: |
           export DEBIAN_FRONTEND=noninteractive
@@ -89,6 +68,27 @@ jobs:
           sudo apt-get -q -o=Dpkg::Use-Pty=0 update
           sudo apt-get -qq install $packages
 
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
+      - name: Install Wine
+        if: matrix.mingw
+        run: |
+          sudo dpkg --add-architecture i386
+
+          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo 
apt-key add -
+          sudo add-apt-repository "deb 
https://dl.winehq.org/wine-builds/debian $(lsb_release -cs) main"
+
+          sudo apt-get -qq update
+
+          # Workaround the issue with Wine.
+          sudo apt-get -qq install libasound2-plugins:i386 libgphoto2-6:i386
+          sudo apt-get -qq install wine-stable-i386
+          sudo apt-get -qq install wine-stable
+          sudo apt-get -qq install --install-recommends winehq-stable
+
       - name: System and environment setup
         run: |
           sudo sed -i'' -e 's/^int _putenv/_CRTIMP int _putenv/' 
/usr/share/libtool/build-aux/ltmain.sh