revert to win64 build

0lvin · Dec 24, 2023 · 088063a · 088063a
1 parent ff2cbee
commit 088063a
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { sys: mingw32, env: i686 }
+          - { sys: mingw64, env: x86_64 }
     steps:
     - uses: msys2/setup-msys2@v2
       with:
@@ -21,7 +21,6 @@ jobs:
           git
           make
           zip
-          p7zip
           unzip
           mingw-w64-${{matrix.env}}-curl
           mingw-w64-${{matrix.env}}-ffmpeg
@@ -40,17 +39,27 @@ jobs:
     - name: Create release package
       shell: msys2 {0}
       run: |
+        # copy docs
+        cp -rv stuff/mapfixes/* LICENSE README.md doc release/
         # static ffmpeg
-        wget -c https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.1-full_build-shared.7z
-        7z x ffmpeg-6.1-full_build-shared.7z
-        cp ffmpeg-6.1-full_build-shared/bin/*.dll release/
+        wget -c https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2023-11-30-12-55/ffmpeg-n6.0.1-win64-lgpl-shared-6.0.zip
+        unzip -o ffmpeg-n6.0.1-win64-lgpl-shared-6.0.zip
+        cp ffmpeg-n6.0.1-win64-lgpl-shared-6.0/bin/*.dll release/
         # static SDL2
-        wget -c https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-2.28.5-win32-x86.zip
+        wget -c https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-2.28.5-win32-x64.zip
+        unzip -o SDL2-2.28.5-win32-x64.zip
+        cp SDL2.dll release/
+        # static openal
+        wget -c https://www.openal-soft.org/openal-binaries/openal-soft-1.23.1-bin.zip
+        unzip -o openal-soft-1.23.1-bin.zip
+        cp openal-soft-1.23.1-bin/bin/Win64/soft_oal.dll release/OpenAL32.dll
+        # static curl
+        wget -c https://curl.se/windows/dl-8.5.0_3/curl-8.5.0_3-win64-mingw.zip
+        unzip -o curl-8.5.0_3-win64-mingw.zip
+        cp curl-8.5.0_3-win64-mingw/bin/libcurl-x64.dll release/curl.dll
         # create archive
         mkdir yquake2remaster-${{matrix.env}}-${{github.ref_name}}
-        cp -rv LICENSE README.md yquake2remaster-${{matrix.env}}-${{github.ref_name}}
         cp -rv release/* yquake2remaster-${{matrix.env}}-${{github.ref_name}}
-        cp -rv stuff/mapfixes/* yquake2remaster-${{matrix.env}}-${{github.ref_name}}
         zip -9r yquake2remaster-${{matrix.env}}-${{github.ref_name}}.zip yquake2remaster-${{matrix.env}}-${{github.ref_name}}
     - name: Upload Release Asset
       uses: softprops/action-gh-release@v1