Actions: windows, removed env var and renamed the 64 bit file

Yubico · Jan 29, 2020 · 5b67bf4 · 5b67bf4
1 parent 880a06c
commit 5b67bf4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/windows-libs.sha256sum → .github/workflows/windows-x64-libs.sha256sum b/.github/workflows/windows-libs.sha256sum → .github/workflows/windows-x64-libs.sha256sum
diff --git a/.github/workflows/windows.yml → .github/workflows/windows-x64.yml b/.github/workflows/windows.yml → .github/workflows/windows-x64.yml
@@ -1,11 +1,10 @@
-name: windows
+name: windows 64bit
 
 on: [push, pull_request]
 
 env:
   PYTHON_VER: '3.8.1'
   PYTHON_VER_DIRNAME: 'python38'
-  PYOTHERSIDE_VER: '1.5.9'
 
 jobs:
   build:
@@ -22,7 +21,7 @@ jobs:
       - name: Download dependencies
         run: |
           wget https://download.qt.io/official_releases/jom/jom.zip -OutFile jom.zip
-          wget https://github.com/thp/pyotherside/archive/$env:PYOTHERSIDE_VER.zip -OutFile pyotherside-$env:PYOTHERSIDE_VER.zip
+          wget https://github.com/thp/pyotherside/archive/1.5.9.zip -OutFile pyotherside-1.5.9.zip
           wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win64.zip -OutFile ykpers-1.20.0-win64.zip
           wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win64.zip.sig -OutFile ykpers-1.20.0-win64.zip.sig
           wget https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.7z -OutFile libusb-1.0.22.7z
@@ -34,7 +33,7 @@ jobs:
 
       - name: Verify checksums of downloaded files
         run: |
-          sha256sum -c ./.github/workflows/windows-libs.sha256sum
+          sha256sum -c ./.github/workflows/windows-x64-libs.sha256sum
           gpg --no-default-keyring --keyring yubico --verify ykpers-1.20.0-win64.zip.sig ykpers-1.20.0-win64.zip
 
       - name: Install swig
@@ -49,8 +48,8 @@ jobs:
 
       - name: Download and prepare pyotherside
         run: |
-          7z x pyotherside-$env:PYOTHERSIDE_VER.zip
-          cd pyotherside-$env:PYOTHERSIDE_VER
+          7z x pyotherside-1.5.9.zip
+          cd pyotherside-1.5.9
           (Get-Content .\src\qmldir).replace('pyothersideplugin', 'pyothersideplugin1') | Set-Content .\src\qmldir
           Clear-Content python.pri
           Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x64\libs -l$env:PYTHON_VER_DIRNAME`nQMAKE_CXXFLAGS += -IC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x64\include`n"
@@ -61,7 +60,7 @@ jobs:
         run: |
           set PATH=D:\a\yubikey-manager-qt\yubikey-manager-qt\5.13.1\msvc2017_64\bin;D:\a\yubikey-manager-qt\yubikey-manager-qt;%PATH%
           call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x64
-          cd pyotherside-$env:PYOTHERSIDE_VER
+          cd pyotherside-1.5.9
           qmake
           jom
           jom install

diff --git a/.github/workflows/windows-x86.yml b/.github/workflows/windows-x86.yml
@@ -5,7 +5,6 @@ on: [push, pull_request]
 env:
   PYTHON_VER: '3.8.1'
   PYTHON_VER_DIRNAME: 'python38'
-  PYOTHERSIDE_VER: '1.5.9'
 
 jobs:
   build:
@@ -22,7 +21,7 @@ jobs:
       - name: Download dependencies
         run: |
           wget https://download.qt.io/official_releases/jom/jom.zip -OutFile jom.zip
-          wget https://github.com/thp/pyotherside/archive/$env:PYOTHERSIDE_VER.zip -OutFile pyotherside-$env:PYOTHERSIDE_VER.zip
+          wget https://github.com/thp/pyotherside/archive/1.5.9.zip -OutFile pyotherside-1.5.9.zip
           wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win32.zip -OutFile ykpers-1.20.0-win32.zip
           wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win32.zip.sig -OutFile ykpers-1.20.0-win32.zip.sig
           wget https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.7z -OutFile libusb-1.0.22.7z
@@ -49,8 +48,8 @@ jobs:
 
       - name: Unpack and prepare pyotherside
         run: |
-          7z x pyotherside-$env:PYOTHERSIDE_VER.zip
-          cd pyotherside-$env:PYOTHERSIDE_VER
+          7z x pyotherside-1.5.9.zip
+          cd pyotherside-1.5.9
           (Get-Content .\src\qmldir).replace('pyothersideplugin', 'pyothersideplugin1') | Set-Content .\src\qmldir
           Clear-Content python.pri
           Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\libs -l$env:PYTHON_VER_DIRNAME`nQMAKE_CXXFLAGS += -IC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\include`n"
@@ -61,7 +60,7 @@ jobs:
         run: |
           set PATH=D:\a\yubikey-manager-qt\yubikey-manager-qt\5.13.1\msvc2017\bin;D:\a\yubikey-manager-qt\yubikey-manager-qt;%PATH%
           call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86
-          cd pyotherside-$env:PYOTHERSIDE_VER
+          cd pyotherside-1.5.9
           qmake
           jom
           jom install