浏览代码

fixed for win mac build

Thomas Buck 3 年前
父节点
当前提交
20337915fe
共有 2 个文件被更改,包括 10 次插入4 次删除
  1. 5
    2
      .github/workflows/build.yml
  2. 5
    2
      build_mac.sh

+ 5
- 2
.github/workflows/build.yml 查看文件

23
     - name: Archive build result artifacts
23
     - name: Archive build result artifacts
24
       uses: actions/upload-artifact@v2
24
       uses: actions/upload-artifact@v2
25
       with:
25
       with:
26
-        name: mac-build
26
+        name: octotray_mac
27
         path: |
27
         path: |
28
-          ${{ github.workspace }}/build/dist
28
+          ${{ github.workspace }}/build/dist/OctoTray_Mac.zip
29
   build_windows:
29
   build_windows:
30
     runs-on: windows-latest
30
     runs-on: windows-latest
31
     steps:
31
     steps:
40
         python -m pip install --upgrade pip
40
         python -m pip install --upgrade pip
41
         pip install PyQt5
41
         pip install PyQt5
42
         pip install py2exe
42
         pip install py2exe
43
+      shell: bash
43
     - name: Run Windows build
44
     - name: Run Windows build
44
       run: |
45
       run: |
45
         ./build_win.sh
46
         ./build_win.sh
47
+      shell: bash
46
     - name: Show build results
48
     - name: Show build results
47
       run: |
49
       run: |
48
         ls ${{ github.workspace }}/build/win
50
         ls ${{ github.workspace }}/build/win
49
         ls ${{ github.workspace }}/build/dist
51
         ls ${{ github.workspace }}/build/dist
52
+      shell: bash

+ 5
- 2
build_mac.sh 查看文件

10
 cd build/mac
10
 cd build/mac
11
 python setup_mac.py py2app
11
 python setup_mac.py py2app
12
 
12
 
13
-cd ../..
13
+cd dist
14
+zip -r OctoTray_Mac.zip OctoTray.app
15
+
16
+cd ../../..
14
 mkdir -p build/dist
17
 mkdir -p build/dist
15
-cp -r build/mac/dist/OctoTray.app build/dist/
18
+cp -r build/mac/OctoTray_Mac.zip build/dist/

正在加载...
取消
保存