fix perl modules installation

move it into installation section outside cache processing
davidrg · Nov 27, 2024 · b7b9593 · b7b9593
1 parent 767a5fb
commit b7b9593
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -226,6 +226,10 @@ jobs:
         #sdk:   # use the latest
         #spectre: # set true to use VC libraries with sepctre mitigations
 
+    - name: Install perl modules required by OpenSSL build
+      run: cpan -i Text::Template
+      shell: powershell
+
       ##########################################################################
       # Build optional dependencies (zlib, openssl, libssh)                    #
       ##########################################################################
@@ -306,9 +310,11 @@ jobs:
         del *.gz
         cd ..
         
-        # Get and unpack nasm
+        # CD into the tools directory
         mkdir tools
         cd tools
+
+        # Get and unpack nasm
         wget https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win32/nasm-2.15.05-win32.zip -outfile nasm-2.15.05-win32.zip
         7z x nasm-2.15.05-win32.zip
         ren nasm-2.15.05 nasm
@@ -341,11 +347,9 @@ jobs:
         dir ${{github.workspace}}\kerberos\kfw
         cd ..
         
+        # CD out of the tools directory
         cd ..          
         
-        # Install perl modules required by OpenSSL build
-        cpan -i Text::Template
-        
         cd rexx
         
         # Get Regina REXX
@@ -826,6 +830,9 @@ jobs:
         run: vcredist_x86.exe /q /norestart
         shell: cmd
         working-directory: ${{ github.workspace }}
+      - name: Install perl modules required by OpenSSL build
+        run: cpan -i Text::Template
+        shell: powershell
 
         ##########################################################################
         # Build optional dependencies (openssl, libdes)                          #
@@ -887,9 +894,6 @@ jobs:
           del *.zip
           cd ..
           cd ..
-          
-          # Install perl modules required by OpenSSL build
-          cpan -i Text::Template
         shell: powershell
 
       - name: Build openssl (ia64)
@@ -1467,10 +1471,15 @@ jobs:
 
         shell: powershell
 
+      - name: Install perl modules required by OpenSSL build
+        if: matrix.legacy_dependencies == 'yes'
+        run: cpan -i Text::Template
+        shell: powershell
+
       - name: Cache legacy dependencies
+        if: matrix.legacy_dependencies == 'yes'
         uses: "./.github/actions/cache"
         id: cache-legacy-deps
-        if: matrix.legacy_dependencies == 'yes'
         with:
           path: |
             ${{github.workspace}}\srp-2.1.2
@@ -1559,9 +1568,6 @@ jobs:
           del README.1ST
           del slatfio.zip
           cd ..
-          
-          # Install perl modules required by OpenSSL build
-          cpan -i Text::Template
         shell: powershell
 
       - name: Build libdes
@@ -1971,6 +1977,9 @@ jobs:
 
       - name: Install MinGW-w64
         run: sudo apt install -y g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix binutils-mingw-w64-x86-64
+      - name: Install perl modules required by OpenSSL build
+        run: sudo cpan -i Text::Template
+        shell: bash
 
       - name: Cache Dependencies
         uses: "./.github/actions/cache"