Parcourir la source

fixed for win mac build

Thomas Buck il y a 3 ans
Parent
révision
20337915fe
2 fichiers modifiés avec 10 ajouts et 4 suppressions
  1. 5
    2
      .github/workflows/build.yml
  2. 5
    2
      build_mac.sh

+ 5
- 2
.github/workflows/build.yml Voir le fichier

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

+ 5
- 2
build_mac.sh Voir le fichier

@@ -10,6 +10,9 @@ cp dist/setup_mac.py build/mac/
10 10
 cd build/mac
11 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 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/

Chargement…
Annuler
Enregistrer