Update build script

pjlt · Jul 31, 2024 · 07385b5 · 07385b5
1 parent 7fafdaa
commit 07385b5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,4 +59,24 @@ jobs:
           alias g++='g++-10'
           export CC=`which gcc-10`
           export CXX=`which g++-10`
+          bash build.sh build Release
+  macOS:
+    runs-on: macos-14
+    steps:
+      - name: Checkout
+        with:
+          submodules: true
+        uses: actions/checkout@v4
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: '==3.1.*'
+          version: '6.5.3'
+          host: 'mac'
+          target: 'desktop'
+          arch: 'clang_64'
+      - name: Fetch prebuilt
+        run: bash build.sh prebuilt fetch
+      - name: Build lanthing-pc
+        run: |
           bash build.sh build Release
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -22,11 +22,11 @@ jobs:
           target: 'desktop'
           arch: 'win64_msvc2019_64'
       - name: Fetch prebuilt
-        run: ./build.ps1 prebuilt fetch
+        run: ./build.win.ps1 prebuilt fetch
       - name: Build lanthing-pc
         run: |
           $LT_DUMP_URL = "${{ vars.LT_DUMP_URL }}"
-          ./build.ps1 build Release
+          ./build.win.ps1 build Release
       - name: Generate Zip
         run: |
           echo ${{ github.sha }} > Release.txt
@@ -64,15 +64,15 @@ jobs:
           target: 'desktop'
           arch: 'gcc_64'
       - name: Fetch prebuilt
-        run: bash build.sh prebuilt fetch
+        run: bash build.linux.sh prebuilt fetch
       - name: Build lanthing-pc
         run: |
           alias gcc='gcc-10'
           alias g++='g++-10'
           export CC=`which gcc-10`
           export CXX=`which g++-10`
           export LT_DUMP_URL="${{ vars.LT_DUMP_URL }}"
-          bash build.sh build Release
+          bash build.linux.sh build Release
       - name: Set version
         run: |
           VERSION=${{ github.ref_name }}
@@ -81,7 +81,7 @@ jobs:
           echo "Set VERSION to $VERSION"
       - name: Make AppImage
         run: |
-          bash build.sh package Release
+          bash build.linux.sh package Release
           cp lanthing-${{ env.VERSION }}-x86_64.AppImage lanthing.linux-${{ env.VERSION }}-x86_64.AppImage
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/build.sh → build.linux.sh b/build.sh → build.linux.sh
diff --git a/build.mac.sh b/build.mac.sh
@@ -38,7 +38,7 @@ check_build_type() {
 }
 
 rtc_fetch() {
-    rtc_url="https://github.com/numbaa/rtc-prebuilt/releases/download/v0.7.9/rtc.mac.zip"
+    rtc_url="https://github.com/numbaa/rtc-prebuilt/releases/download/v0.7.10/rtc.mac.zip"
     mkdir -p ./transport/rtc/mac
     echo "Fetch $rtc_url"
     curl -L $rtc_url -o ./third_party/prebuilt/rtc.mac.zip
@@ -69,7 +69,7 @@ prebuilt_fetch() {
         echo "Extra $lib_name.mac.tar.gz"
         tar -xzvf ./third_party/prebuilt/$lib_name.mac.tar.gz -C ./third_party/prebuilt/$lib_name/mac
     done
-    #rtc_fetch
+    rtc_fetch
 }
 
 make_bundle() {
@@ -93,7 +93,7 @@ make_bundle() {
 
 prebuilt_clean() {
     rm -rf third_party/prebuilt
-    #rm -rf transport/rtc
+    rm -rf transport/rtc
 }
 
 print_usage() {

diff --git a/build.ps1 → build.win.ps1 b/build.ps1 → build.win.ps1