Merge pull request #25 from jameshwc/dev

v2.0.0
jameshwc · Mar 10, 2022 · 6073fd2 · 6073fd2
2 parents f190c2f + 8b9dc2a
commit 6073fd2
Show file tree

Hide file tree

Showing 15 changed files with 1,030 additions and 578 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,23 +20,23 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    
+
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      
+
       - name: Get version
         run: |
           echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV &&
           echo "VERSION=$(cat version.txt)" >> $env:GITHUB_ENV
-      
+
       - name: Add version
         run: |
           perl -i -pe's/VERSION/V${{ env.VERSION }}/g' gui_main.py
           perl -i -pe's/self.version: str = \"1.0\"/self.version = \"${{ env.VERSION }}\"/g' ceiba/ceiba.py
-      
+
       - name: test
         run: cat ceiba/ceiba.py
 
@@ -45,13 +45,13 @@ jobs:
         if: ${{ matrix.os != 'macos-latest' }}
         with:
           python-version: '3.7'
-      
+
       - name: Set up python version
         uses: actions/setup-python@v2
         if: ${{ matrix.os == 'macos-latest' }}
         with:
           python-version: '3.10'
-          
+
       - name: Install modules
         run: pip3 install -r requirements.txt
 
@@ -65,9 +65,11 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ceiba-downloader-${{ matrix.os }}
-          path: dist/*
+          path: |
+            dist/*
+            version.txt
           retention-days: 1
-  
+
   release:
     name: "Prelease"
     needs: build
@@ -79,23 +81,26 @@ jobs:
       - name: Display fetched artifacts
         run: ls -R
 
+      - name: Save version variable
+        run: echo "VERSION=$(cat ceiba-downloader-ubuntu-latest/version.txt)" >> $GITHUB_ENV
+
       - name: Add execution permission
         run: |
-          chmod +x ceiba-downloader-ubuntu-latest/ceiba-downloader/ceiba-downloader
-          chmod +x ceiba-downloader-macos-latest/ceiba-downloader.app/Contents/MacOS/ceiba-downloader
-      
+          chmod +x ceiba-downloader-ubuntu-latest/dist/ceiba-downloader/ceiba-downloader
+          chmod +x ceiba-downloader-macos-latest/dist/ceiba-downloader.app/Contents/MacOS/ceiba-downloader
+
       - name: Zip files
         run: |
-          cd ceiba-downloader-windows-latest && zip -r ../ceiba-downloader-windows.zip ceiba-downloader && cd ..
-          cd ceiba-downloader-macos-latest && zip -r ../ceiba-downloader-mac.zip ceiba-downloader.app && cd ..
-          cd ceiba-downloader-ubuntu-latest && zip -r ../ceiba-downloader-linux.zip ceiba-downloader && cd ..
+          cd ceiba-downloader-windows-latest/dist && zip -r ../../ceiba-downloader-windows.zip ceiba-downloader && cd ../..
+          cd ceiba-downloader-macos-latest/dist && zip -r ../../ceiba-downloader-mac.zip ceiba-downloader.app && cd ../..
+          cd ceiba-downloader-ubuntu-latest/dist && zip -r ../../ceiba-downloader-linux.zip ceiba-downloader && cd ../..
 
       - name: Emit a Github Release
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
+          automatic_release_tag: "v${{ env.VERSION }}-beta"
           prerelease: true
-          title: "Development Build"
+          title: "v${{ env.VERSION}} (Beta)"
           files: |
             ceiba-downloader*.zip
diff --git a/ceiba-downloader.spec b/ceiba-downloader.spec
@@ -9,7 +9,8 @@ a = Analysis(['gui_main.py'],
              binaries=[],
              datas=[('resources/custom.qss', 'resources'),
                     ('resources/GenSenRounded-M.ttc', 'resources'),
-                    ('resources/ceiba.ico', 'resources')],
+                    ('resources/ceiba.ico', 'resources'),
+                    ('ceiba/i18n/*', 'resources/i18n')],
              hiddenimports=[],
              hookspath=[],
              hooksconfig={},
@@ -23,7 +24,7 @@ pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 
 exe = EXE(pyz,
-          a.scripts, 
+          a.scripts,
           [],
           exclude_binaries=True,
           name='ceiba-downloader',
@@ -40,7 +41,7 @@ exe = EXE(pyz,
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,
-               a.datas, 
+               a.datas,
                strip=False,
                upx=True,
                upx_exclude=[],
@@ -49,4 +50,3 @@ app = BUNDLE(coll,
        name='ceiba-downloader.app',
        icon='resources/ceiba.ico',
        bundle_identifier=None)
-