From 3a1f3e4c0deb65d37671627892111516b7d5842a Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 13 Dec 2020 22:27:27 +0100
Subject: Update build_cmake.yml

---
 .github/workflows/build_cmake.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index f604759..75d6755 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -74,7 +74,11 @@ jobs:
         $attemptCount=0;
         Do {
           $attemptCount++;
-          $wc.DownloadFile("https://miktex.org/download/win/miktexsetup-x64.zip","miktexsetup-x64.zip")
+          Try {
+            $wc.DownloadFile("https://miktex.org/download/win/miktexsetup-x64.zip","miktexsetup-x64.zip")
+          } Catch [Exception] {
+            Write-Host $_.Exception | format-list -force
+          }
         } while (((Test-Path "miktexsetup-x64.zip") -eq $false) -and ($attemptCount -le $maxAttempts))  
       shell: pwsh
       if: matrix.config.os == 'windows-latest'
@@ -137,14 +141,7 @@ jobs:
       run:
         choco install winflexbison
       if: matrix.config.os == 'windows-latest'
-        
-    - name: Install libiconv (Windows)
-      run:
-        7z e -oiconv libiconv-for-Windows_1.16.7z
-                
-        set(ENV{EXTRA_CMAKE_OPTS} "-DICONV_INCLUDE_DIR=iconv/include -DICONV_LIBRARY=iconv/lib/libiconv.lib")
-      if: matrix.config.os == 'windows-latest'    
-    
+          
     - name: Setup VS Environment (Windows)
       uses: seanmiddleditch/gha-setup-vsdevenv@master
       if: matrix.config.os == 'windows-latest'
@@ -159,13 +156,12 @@ jobs:
           COMMAND cmake
             -S .
             -B build
-            -D CMAKE_BUILD_TYPE=$ENV{BUILD_TYPE}
+            -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }}
             -G "${{ matrix.config.build_gen }}"
             -Dbuild_doc=YES
             -Dbuild_app=YES
             -Dbuild_parse=YES
             -Dbuild_xmlparser=YES            
-            ${EXTRA_CMAKE_OPTS}
           RESULT_VARIABLE result
         )
         if (NOT result EQUAL 0)
-- 
cgit v0.12