add changes from build.yml to release.yaml

lightspark · Jun 19, 2024 · 149576b · 149576b
1 parent a08db9e
commit 149576b
Showing 1 changed file with 42 additions and 46 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -49,34 +49,32 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Add MXE Repository to Apt
-        uses: myci-actions/add-deb-repo@4
+        uses: myci-actions/add-deb-repo@11
         with:
           repo: deb http://pkg.mxe.cc/repos/apt focal main
           repo-name: mxe
-          keys: ${{ secrets.MXE_REPO_KEY }}
-          key-server: keyserver.ubuntu.com
+          keys-asc: https://pkg.mxe.cc/repos/apt/client-conf/mxeapt.gpg
+          install:
+            nasm
+            libtool
+            libtool-bin
+            gperf
+            lzip
+            p7zip-full
+            intltool
+            mxe-i686-w64-mingw32.static-cc
+            mxe-i686-w64-mingw32.static-cairo
+            mxe-i686-w64-mingw32.static-pango
+            mxe-i686-w64-mingw32.static-jpeg
+            mxe-i686-w64-mingw32.static-glew
+            mxe-i686-w64-mingw32.static-freetype
+            mxe-i686-w64-mingw32.static-curl
+            mxe-i686-w64-mingw32.static-librtmp
+            mxe-i686-w64-mingw32.static-ffmpeg
+            mxe-i686-w64-mingw32.static-sdl2
 
       - name: Install MXE Build Environment
         run: |
-          sudo apt update
-          sudo apt install \
-            nasm \
-            libtool \
-            libtool-bin \
-            gperf \
-            lzip \
-            p7zip-full \
-            intltool \
-            mxe-i686-w64-mingw32.static-cc \
-            mxe-i686-w64-mingw32.static-cairo \
-            mxe-i686-w64-mingw32.static-pango \
-            mxe-i686-w64-mingw32.static-jpeg \
-            mxe-i686-w64-mingw32.static-glew \
-            mxe-i686-w64-mingw32.static-freetype \
-            mxe-i686-w64-mingw32.static-curl \
-            mxe-i686-w64-mingw32.static-librtmp \
-            mxe-i686-w64-mingw32.static-ffmpeg \
-            mxe-i686-w64-mingw32.static-sdl2
           echo /usr/lib/mxe/usr/bin >> $GITHUB_PATH  # exposes it to all future steps
 
       - name: Configure MXE for NSIS Installer Builds
@@ -96,7 +94,7 @@ jobs:
           mv -v Lightspark*exe Lightspark-v${{ needs.draft_release.outputs.version }}-Installer-win32.exe
 
       - name: Upload Installer Release Asset
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -115,34 +113,32 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Add MXE Repository to Apt
-        uses: myci-actions/add-deb-repo@4
+        uses: myci-actions/add-deb-repo@11
         with:
           repo: deb http://pkg.mxe.cc/repos/apt bionic main
           repo-name: mxe
-          keys: ${{ secrets.MXE_REPO_KEY }}
-          key-server: keyserver.ubuntu.com
+          keys-asc: https://pkg.mxe.cc/repos/apt/client-conf/mxeapt.gpg
+          install:
+            nasm
+            libtool
+            libtool-bin
+            gperf
+            lzip
+            p7zip-full
+            intltool
+            mxe-x86-64-w64-mingw32.static-cc
+            mxe-x86-64-w64-mingw32.static-cairo
+            mxe-x86-64-w64-mingw32.static-pango
+            mxe-x86-64-w64-mingw32.static-jpeg
+            mxe-x86-64-w64-mingw32.static-glew
+            mxe-x86-64-w64-mingw32.static-freetype
+            mxe-x86-64-w64-mingw32.static-curl
+            mxe-x86-64-w64-mingw32.static-librtmp
+            mxe-x86-64-w64-mingw32.static-ffmpeg
+            mxe-x86-64-w64-mingw32.static-sdl2
 
       - name: Install MXE Build Environment
         run: |
-          sudo apt update
-          sudo apt install \
-            nasm \
-            libtool \
-            libtool-bin \
-            gperf \
-            lzip \
-            p7zip-full \
-            intltool \
-            mxe-x86-64-w64-mingw32.static-cc \
-            mxe-x86-64-w64-mingw32.static-cairo \
-            mxe-x86-64-w64-mingw32.static-pango \
-            mxe-x86-64-w64-mingw32.static-jpeg \
-            mxe-x86-64-w64-mingw32.static-glew \
-            mxe-x86-64-w64-mingw32.static-freetype \
-            mxe-x86-64-w64-mingw32.static-curl \
-            mxe-x86-64-w64-mingw32.static-librtmp \
-            mxe-x86-64-w64-mingw32.static-ffmpeg \
-            mxe-x86-64-w64-mingw32.static-sdl2
           echo /usr/lib/mxe/usr/bin >> $GITHUB_PATH  # exposes it to all future steps
 
       - name: Configure MXE for NSIS Installer Builds
@@ -162,7 +158,7 @@ jobs:
           mv -v Lightspark*exe Lightspark-v${{ needs.draft_release.outputs.version }}-Installer-win64.exe
 
       - name: Upload Installer Release Asset
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: