From 155d94c28b5b4a08a3bdc20ba4014698999164b2 Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:00:13 -0500 Subject: [PATCH 1/7] Added publish-python-package workflow --- .github/workflows/build-application.yml | 2 +- .github/workflows/publish-python-package.yml | 26 ++++++++++++++++++++ application/package.json | 2 +- pyproject.toml | 2 +- setup.py | 2 +- 5 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/publish-python-package.yml diff --git a/.github/workflows/build-application.yml b/.github/workflows/build-application.yml index 5d8301a..eb6079a 100644 --- a/.github/workflows/build-application.yml +++ b/.github/workflows/build-application.yml @@ -1,4 +1,4 @@ -name: Package Release +name: Build Desktop Application on: release: diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml new file mode 100644 index 0000000..2d3c4d7 --- /dev/null +++ b/.github/workflows/publish-python-package.yml @@ -0,0 +1,26 @@ +name: Publish Python Package + +on: + release: + types: [published] + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.8' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Build Package + run: python -m build + - name: Publish Package + run: python3 -m twine upload dist/* + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{secrets.PYPI_API_TOKEN}} \ No newline at end of file diff --git a/application/package.json b/application/package.json index 308be31..40c37a6 100644 --- a/application/package.json +++ b/application/package.json @@ -1,7 +1,7 @@ { "name": "kbs-electron", "productName": "Keyboard Sounds", - "version": "1.0.4", + "version": "1.0.5", "description": "https://keyboardsounds.net/", "main": ".webpack/main", "repository": { diff --git a/pyproject.toml b/pyproject.toml index eea5380..de559ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "keyboardsounds" -version = "5.7.8" +version = "5.7.9" authors = [ { name="Nathan Fiscaletti", email="nate.fiscaletti@gmail.com" }, ] diff --git a/setup.py b/setup.py index 850294e..346ae86 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="keyboardsounds", - version="5.7.8", + version="5.7.9", description="Adds the ability to play sounds while typing on any system.", author="Nathan Fiscaletti", author_email="nate.fiscaletti@gmail.com", From 83a067e6141b632b9d58fc9ad0a5be7cbad4bda1 Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:02:08 -0500 Subject: [PATCH 2/7] Updated publish-python-package workflow --- .github/workflows/publish-python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml index 2d3c4d7..9f058bf 100644 --- a/.github/workflows/publish-python-package.yml +++ b/.github/workflows/publish-python-package.yml @@ -16,6 +16,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + python -m pip install build pip install -r requirements.txt - name: Build Package run: python -m build From 1a71c3df42411bc12bf5f4c0bee57ee43210c459 Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:07:54 -0500 Subject: [PATCH 3/7] Updated publish-python-package workflow --- .github/workflows/publish-python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml index 9f058bf..65ed7ce 100644 --- a/.github/workflows/publish-python-package.yml +++ b/.github/workflows/publish-python-package.yml @@ -17,6 +17,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install build + python -m pip install twine pip install -r requirements.txt - name: Build Package run: python -m build From 18e7a6845ed8bc66e70866caa562301f4616a506 Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:12:23 -0500 Subject: [PATCH 4/7] Updated workflows --- ...d-application.yml => build-and-deploy.yml} | 26 +++++++++++++++-- .github/workflows/publish-python-package.yml | 28 ------------------- 2 files changed, 24 insertions(+), 30 deletions(-) rename .github/workflows/{build-application.yml => build-and-deploy.yml} (59%) delete mode 100644 .github/workflows/publish-python-package.yml diff --git a/.github/workflows/build-application.yml b/.github/workflows/build-and-deploy.yml similarity index 59% rename from .github/workflows/build-application.yml rename to .github/workflows/build-and-deploy.yml index eb6079a..3e45ab8 100644 --- a/.github/workflows/build-application.yml +++ b/.github/workflows/build-and-deploy.yml @@ -1,11 +1,33 @@ -name: Build Desktop Application +name: Build & Deploy on: release: types: [published] jobs: - build-and-deploy: + build-and-deploy-python-package: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.8' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install build + python -m pip install twine + pip install -r requirements.txt + - name: Build Package + run: python -m build + - name: Publish Package + run: python3 -m twine upload dist/* + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{secrets.PYPI_API_TOKEN}} + + build-desktop-app: runs-on: windows-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml deleted file mode 100644 index 65ed7ce..0000000 --- a/.github/workflows/publish-python-package.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Publish Python Package - -on: - release: - types: [published] - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.8' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install build - python -m pip install twine - pip install -r requirements.txt - - name: Build Package - run: python -m build - - name: Publish Package - run: python3 -m twine upload dist/* - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{secrets.PYPI_API_TOKEN}} \ No newline at end of file From 396aebc7b8c6d8f9bbc56716796a621f91b5c631 Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:13:59 -0500 Subject: [PATCH 5/7] Update workflows --- .github/workflows/build-and-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 3e45ab8..587e470 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -29,6 +29,7 @@ jobs: build-desktop-app: runs-on: windows-latest + needs: build-and-deploy-python-package steps: - uses: actions/checkout@v2 - name: Install Node.js From 9dc7eb7ec70c0ac28b9df78a27c4163a3e73990d Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:15:48 -0500 Subject: [PATCH 6/7] Update workflows --- .github/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 587e470..83af972 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -22,7 +22,7 @@ jobs: - name: Build Package run: python -m build - name: Publish Package - run: python3 -m twine upload dist/* + run: python3 -m twine upload dist/* --verbose env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{secrets.PYPI_API_TOKEN}} From 5f58f56c9bea08ea942e57b251990081f65c77fb Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Mon, 15 Jul 2024 13:22:30 -0500 Subject: [PATCH 7/7] desktop application v1.0.6, backend v5.8.0 --- application/package.json | 2 +- pyproject.toml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/package.json b/application/package.json index 40c37a6..aab8a94 100644 --- a/application/package.json +++ b/application/package.json @@ -1,7 +1,7 @@ { "name": "kbs-electron", "productName": "Keyboard Sounds", - "version": "1.0.5", + "version": "1.0.6", "description": "https://keyboardsounds.net/", "main": ".webpack/main", "repository": { diff --git a/pyproject.toml b/pyproject.toml index de559ae..930d515 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "keyboardsounds" -version = "5.7.9" +version = "5.8.0" authors = [ { name="Nathan Fiscaletti", email="nate.fiscaletti@gmail.com" }, ] diff --git a/setup.py b/setup.py index 346ae86..95f03f4 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="keyboardsounds", - version="5.7.9", + version="5.8.0", description="Adds the ability to play sounds while typing on any system.", author="Nathan Fiscaletti", author_email="nate.fiscaletti@gmail.com",