Merge branch 'dev' of https://github.com/maotoumao/MusicFreeDesktop i…

…nto dev
maotoumao · Jun 16, 2024 · 2563a02 · 2563a02
2 parents 87c1c45 + 7cb5023
commit 2563a02
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -5,8 +5,8 @@ jobs:
     build-windows: 
         runs-on: windows-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                 node-version: 18
             - run: echo (node -p -e '`VERSION=${require("./package.json").version}`') >> $Env:GITHUB_ENV
@@ -17,7 +17,7 @@ jobs:
                   filepath: ./release/build-windows.iss
                   variables: /DMyAppVersion=${{ env.VERSION }} /DMyAppId=${{ secrets.MYAPPID }}
             - name: Upload Setup
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: windows-release
                   path: ./out/MusicFreeSetup.exe
@@ -28,16 +28,16 @@ jobs:
                 files: ./out/MusicFree-win32-x64
                 dest: MusicFree-win32-x64-portable.zip
             - name: Upload Portable
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: windows-portable-release
                   path: ${{ github.workspace }}/MusicFree-win32-x64-portable.zip
 
     build-windows-legacy: 
         runs-on: windows-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                 node-version: 18
             - run: echo (node -p -e '`VERSION=${require("./package.json").version}`') >> $Env:GITHUB_ENV
@@ -49,7 +49,7 @@ jobs:
                   filepath: ./release/build-windows.iss
                   variables: /DMyAppVersion=${{ env.VERSION }} /DMyAppId=${{ secrets.MYAPPID }}
             - name: Upload Setup
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: windows-legacy-release
                   path: ./out/MusicFreeSetup.exe
@@ -60,62 +60,62 @@ jobs:
                 files: ./out/MusicFree-win32-x64
                 dest: MusicFree-win32-x64-legacy-portable.zip
             - name: Upload Portable
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: windows-legacy-portable-release
                   path: ${{ github.workspace }}/MusicFree-win32-x64-legacy-portable.zip
 
     build-macos-x64: 
         runs-on: macos-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: actions/setup-python@v4
               with:
                 python-version: '3.10'
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                 node-version: 18
             - run: node -p -e '`VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
             - run: npm install
-            - run: npm run make
+            - run: npm run make -- --arch="x64"
             - run: ls ./out/make
             - name: Upload Setup
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: macos-x64-dmg-release
                   path: ./out/make/MusicFree-${{ env.VERSION }}-x64.dmg
 
     build-macos-arm64: 
         runs-on: macos-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: actions/setup-python@v4
               with:
                 python-version: '3.10'
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                 node-version: 18
             - run: node -p -e '`VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
             - run: npm install
             - run: npm run make -- --arch="arm64"
             - name: Upload Setup
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: macos-arm64-dmg-release
                   path: ./out/make/MusicFree-${{ env.VERSION }}-arm64.dmg
 
     build-ubuntu: 
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                 node-version: 18
             - run: node -p -e '`VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
             - run: npm install
             - run: npm run make
             - name: Upload Setup
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: ubuntu-release
                   path: ./out/make/deb/x64/

diff --git a/release/build-windows.iss b/release/build-windows.iss
@@ -5,8 +5,8 @@
 #ifndef MyAppVersion
 #define MyAppVersion "0.0.0-alpha.0"
 #endif
-#define MyAppPublisher "猫头猫"
-#define MyAppURL "http://musicfree.upup.fun"
+#define MyAppPublisher "maotoumao"
+#define MyAppURL "https://musicfree.upup.fun"
 #define MyAppExeName "MusicFree.exe"
 #ifndef MyAppId
 #define MyAppId