diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 355385c..8948142 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,99 +117,99 @@ jobs: with: files: ${{ matrix.OUT_FILE_NAME }} - build-docker: - name: Build Docker image and push - runs-on: ubuntu-latest + # build-docker: + # name: Build Docker image and push + # runs-on: ubuntu-latest - permissions: - contents: read - packages: write + # permissions: + # contents: read + # packages: write - steps: - - name: Checkout repository - uses: actions/checkout@v3 + # steps: + # - name: Checkout repository + # uses: actions/checkout@v3 - - name: Log in to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + # - name: Log in to Docker Hub + # uses: docker/login-action@v2 + # with: + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + # - name: Login to GitHub Container Registry + # uses: docker/login-action@v2 + # with: + # registry: ghcr.io + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker (min-cli) - id: meta_min_cli - uses: docker/metadata-action@v4 - with: - images: | - ${{ github.repository }} - ghcr.io/${{ github.repository }} - flavor: | - suffix=-min-cli,onlatest=true + # - name: Extract metadata (tags, labels) for Docker (min-cli) + # id: meta_min_cli + # uses: docker/metadata-action@v4 + # with: + # images: | + # ${{ github.repository }} + # ghcr.io/${{ github.repository }} + # flavor: | + # suffix=-min-cli,onlatest=true - - name: Extract metadata (tags, labels) for Docker (min-gui) - id: meta_min_gui - uses: docker/metadata-action@v4 - with: - images: | - ${{ github.repository }} - ghcr.io/${{ github.repository }} - flavor: | - suffix=-min-gui,onlatest=true + # - name: Extract metadata (tags, labels) for Docker (min-gui) + # id: meta_min_gui + # uses: docker/metadata-action@v4 + # with: + # images: | + # ${{ github.repository }} + # ghcr.io/${{ github.repository }} + # flavor: | + # suffix=-min-gui,onlatest=true - - name: Extract metadata (tags, labels) for Docker (full) - id: meta_full - uses: docker/metadata-action@v4 - with: - images: | - ${{ github.repository }} - ghcr.io/${{ github.repository }} + # - name: Extract metadata (tags, labels) for Docker (full) + # id: meta_full + # uses: docker/metadata-action@v4 + # with: + # images: | + # ${{ github.repository }} + # ghcr.io/${{ github.repository }} - - name: Build and push Docker image (min-cli) - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: ${{ steps.meta_min_cli.outputs.tags }} - labels: ${{ steps.meta_min_cli.outputs.labels }} - target: min-cli + # - name: Build and push Docker image (min-cli) + # uses: docker/build-push-action@v4 + # with: + # context: . + # push: true + # tags: ${{ steps.meta_min_cli.outputs.tags }} + # labels: ${{ steps.meta_min_cli.outputs.labels }} + # target: min-cli - - name: Build and push Docker image (min-gui) - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: ${{ steps.meta_min_gui.outputs.tags }} - labels: ${{ steps.meta_min_gui.outputs.labels }} - target: min-gui + # - name: Build and push Docker image (min-gui) + # uses: docker/build-push-action@v4 + # with: + # context: . + # push: true + # tags: ${{ steps.meta_min_gui.outputs.tags }} + # labels: ${{ steps.meta_min_gui.outputs.labels }} + # target: min-gui - - name: Build and push Docker image (full) - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: ${{ steps.meta_full.outputs.tags }} - labels: ${{ steps.meta_full.outputs.labels }} - target: full + # - name: Build and push Docker image (full) + # uses: docker/build-push-action@v4 + # with: + # context: . + # push: true + # tags: ${{ steps.meta_full.outputs.tags }} + # labels: ${{ steps.meta_full.outputs.labels }} + # target: full - upload-pypi: - name: Upload to pypi - needs: [build-wheel, build-binary] - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v3 - with: - # unpacks default artifact into dist/ - # if `name: artifact` is omitted, the action will create extra parent dir - name: artifact - path: dist + # upload-pypi: + # name: Upload to pypi + # needs: [build-wheel, build-binary] + # runs-on: ubuntu-latest + # steps: + # - uses: actions/download-artifact@v3 + # with: + # # unpacks default artifact into dist/ + # # if `name: artifact` is omitted, the action will create extra parent dir + # name: artifact + # path: dist - - uses: pypa/gh-action-pypi-publish@v1.5.0 - with: - user: __token__ - password: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file + # - uses: pypa/gh-action-pypi-publish@v1.5.0 + # with: + # user: __token__ + # password: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file diff --git a/msicreator.json b/msicreator.json index 12caa38..4daeefd 100644 --- a/msicreator.json +++ b/msicreator.json @@ -1,6 +1,6 @@ { "upgrade_guid": "1279FFE1-5C4A-4354-B0A0-5A3FCF2719E3", - "version": "2.1.14", + "version": "2.1.15", "product_name": "sticker-convert", "manufacturer": "laggykiller", "name": "sticker-convert", diff --git a/src/sticker_convert/__init__.py b/src/sticker_convert/__init__.py index 64a8478..4266ab1 100755 --- a/src/sticker_convert/__init__.py +++ b/src/sticker_convert/__init__.py @@ -1,3 +1,3 @@ #!/usr/bin/env python3 '''sticker-convert''' -__version__ = '2.1.14' \ No newline at end of file +__version__ = '2.1.15' \ No newline at end of file diff --git a/src/sticker_convert/__main__.py b/src/sticker_convert/__main__.py index 26dcad6..4231583 100755 --- a/src/sticker_convert/__main__.py +++ b/src/sticker_convert/__main__.py @@ -2,13 +2,8 @@ def main(): import multiprocessing import sys - import os multiprocessing.freeze_support() - script_path = os.path.dirname(__file__) - if not os.path.isdir(script_path): - script_path = os.path.dirname(sys.argv[0]) - os.chdir(script_path) if len(sys.argv) == 1: print("Launching GUI...") from sticker_convert.gui import GUI # type: ignore