Explorar el Código

fix CI (#2197)

* fix CI

* fix win
Le Tan hace 3 años
padre
commit
14475330da
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 1 1
      .github/workflows/ci-linux.yml
  2. 3 3
      .github/workflows/ci-win.yml

+ 1 - 1
.github/workflows/ci-linux.yml

@@ -62,7 +62,7 @@ jobs:
 
       - name: Compile qt5ct
         run: |
-          wget -c https://excellmedia.dl.sourceforge.net/project/qt5ct/qt5ct-1.1.tar.bz2
+          wget --no-check-certificate -c https://excellmedia.dl.sourceforge.net/project/qt5ct/qt5ct-1.1.tar.bz2
           tar xf qt5ct-1.*.tar.bz2
           cd qt5ct-1.*/
           QT_SELECT=5 qmake

+ 3 - 3
.github/workflows/ci-win.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   build:
     name: ${{ matrix.config.name }}
-    runs-on: windows-2016
+    runs-on: windows-2019
     timeout-minutes: 120
 
     strategy:
@@ -76,7 +76,7 @@ jobs:
       - name: Configure and Build Project
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}}
           qmake -r -spec win32-msvc CONFIG-=debug CONFIG+=release %GITHUB_WORKSPACE%\vnote.pro
           nmake
         working-directory: ${{runner.workspace}}/build
@@ -85,7 +85,7 @@ jobs:
         shell: cmd
         run: |
           mkdir "%DISTRIB_PATH%"
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}}
           windeployqt.exe --dir "%DISTRIB_PATH%" .\src\release\vnote.exe
           copy .\src\release\vnote.exe "%DISTRIB_PATH%\vnote.exe"
           copy .\src\release\vnote_extra.rcc "%DISTRIB_PATH%\vnote_extra.rcc"