test

wyzdwdz · Apr 15, 2024 · 64be9de · 64be9de
1 parent 3e265c7
commit 64be9de
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -23,27 +23,17 @@ jobs:
       - name: set up QEMU
         uses: docker/setup-qemu-action@v2
 
-      - name: x86_64 build appimage
-        if: ${{ matrix.arch == 'x86_64' }}
+      - name: aarch64 build appimage
+        if: ${{ matrix.arch == 'aarch64' }}
         uses: addnab/docker-run-action@v3
         with:
-          image: wyzdwdz/assfonts-amd64:latest
-          options: -v ${{ github.workspace }}:/var/www
+          image: wyzdwdz/assfonts-arm64:latest
+          options: -v ${{ github.workspace }}:/var/www --platform linux/arm64
           shell: bash
           run: |
             cd /var/www
-            ~/linuxdeploy-x86_64.AppImage --appimage-extract-and-run
-
-      # - name: aarch64 build appimage
-      #   if: ${{ matrix.arch == 'aarch64' }}
-      #   uses: addnab/docker-run-action@v3
-      #   with:
-      #     image: wyzdwdz/assfonts-arm64:latest
-      #     options: -v ${{ github.workspace }}:/var/www --platform linux/arm64
-      #     shell: bash
-      #     run: |
-      #       cd /var/www
-      #       ~/linuxdeploy-aarch64.AppImage --appimage-extract-and-run
+            ~/.local/bin/linuxdeploy
+            ~/.local/bin/appimagetool
         
       - name: x86_64 build binary and appimage
         if: ${{ matrix.arch == 'x86_64' }}
@@ -88,10 +78,10 @@ jobs:
           run: |
             cd /var/www
             cp -f ./out/install/linux-arm64/bin/assfonts assfonts-${{ github.ref_name }}-aarch64-Linux
-            ~/linuxdeploy-aarch64.AppImage --appimage-extract-and-run --appdir=./assfonts-gui_AppDir -e ./out/install/linux-arm64/bin/assfonts-gui -d ./src/qt/resources/assfonts-gui.desktop -i ./src/qt/resources/icon.png --icon-filename=assfonts-gui --custom-apprun=./src/qt/resources/AppRun
+            ~/.local/bin/linuxdeploy --appdir=./assfonts-gui_AppDir -e ./out/install/linux-arm64/bin/assfonts-gui -d ./src/qt/resources/assfonts-gui.desktop -i ./src/qt/resources/icon.png --icon-filename=assfonts-gui --custom-apprun=./src/qt/resources/AppRun
             mkdir -p ./assfonts-gui_AppDir/usr/share/doc/assfonts
             cp LICENSE NEWS NOTICE ./assfonts-gui_AppDir/usr/share/doc/assfonts
-            ~/appimagetool-aarch64.AppImage --appimage-extract-and-run ./assfonts-gui_AppDir assfonts-gui-${{ github.ref_name }}-aarch64-Linux.AppImage
+            ~/.local/bin/appimagetool ./assfonts-gui_AppDir assfonts-gui-${{ github.ref_name }}-aarch64-Linux.AppImage
 
       - name: upload Linux
         uses: actions/upload-artifact@v3