Skip to content

Commit

Permalink
Test for fixing relative path bug in CLI
Browse files Browse the repository at this point in the history
  • Loading branch information
laggykiller committed Dec 29, 2023
1 parent 37bb46f commit 6a45e7c
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 91 deletions.
168 changes: 84 additions & 84 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
# - uses: pypa/[email protected]
# with:
# user: __token__
# password: ${{ secrets.PYPI_API_TOKEN }}
2 changes: 1 addition & 1 deletion msicreator.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/sticker_convert/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env python3
'''sticker-convert'''
__version__ = '2.1.14'
__version__ = '2.1.15'
5 changes: 0 additions & 5 deletions src/sticker_convert/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6a45e7c

Please sign in to comment.