Use previous binaries to build new Windows binaries (due to the Qt bug).

Dr-Incognito · Feb 3, 2022 · c2e5148 · c2e5148
1 parent 9866117
commit c2e5148
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml
@@ -33,15 +33,20 @@ jobs:
           cd build
           qmake ../src/V2Ray-Desktop.pro
           make -j16
-          cd ..
-          mkdir dist
+      # Generate dmg
+      - name: Package
+        uses: carlosperate/download-file-action@v1
+        with:
+          file-url: "https://github.com/Dr-Incognito/V2Ray-Desktop/releases/download/2.2.1/V2Ray-Desktop-v2.2.1-win64.zip"
+      - run: |
+          # windeployqt build/release/V2Ray-Desktop.exe --dir dist --release --qmldir src/ui
+          unzip V2Ray-Desktop-v2.2.1-win64.zip -d dist
           copy build/release/V2Ray-Desktop.exe dist
-          windeployqt build/release/V2Ray-Desktop.exe --dir dist --release --qmldir src/ui
       # Localization
       - name: Localization
         run: |
           lrelease src/V2Ray-Desktop.pro
-          mkdir dist/locales
+          # mkdir dist/locales
           copy src/locales/*.qm dist/locales
       # Integrate with clash 1.9.0
       - name: Get clash-1.9.0
@@ -52,20 +57,22 @@ jobs:
         with:
           file-url: "https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb"
       - run: |
-          mkdir dist/clash-core
+          # mkdir dist/clash-core
+          del dist/clash-core/clash.exe
+          del dist/clash-core/Country.mmdb
           unzip clash-windows-amd64-v1.9.0.zip
           move clash-windows-amd64.exe dist/clash-core/clash.exe
           move Country.mmdb dist/clash-core/Country.mmdb
       # Copy OpenSSL Dynamic Link Libraries
-      - name: Fix OpenSSL
-        uses: carlosperate/download-file-action@v1
-        with:
-          file-url: "https://github.com/Dr-Incognito/V2Ray-Desktop/files/7991307/libssl.dll%2Blibcrypto.dll.zip"
-          file-name: "libssl.dll+libcrypto.dll.zip"
-      - run: |
-          unzip libssl.dll+libcrypto.dll.zip
-          move libcrypto-1_1-x64.dll dist
-          move libssl-1_1-x64.dll dist
+      # - name: Fix OpenSSL
+      #   uses: carlosperate/download-file-action@v1
+      #   with:
+      #     file-url: "https://github.com/Dr-Incognito/V2Ray-Desktop/files/7991307/libssl.dll%2Blibcrypto.dll.zip"
+      #     file-name: "libssl.dll+libcrypto.dll.zip"
+      # - run: |
+      #     unzip libssl.dll+libcrypto.dll.zip
+      #     move libcrypto-1_1-x64.dll dist
+      #     move libssl-1_1-x64.dll dist
       # Upload binaries to release
       - name: Create zip release
         uses: vimtor/action-zip@v1