From 1985d56227bf78337f5811e123f607c165f326eb Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 17:48:51 +0400 Subject: [PATCH 01/11] fix(ci): appimage build --- release-utils/appimage/appimage_after_bundle.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release-utils/appimage/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh index 67c6a460..319b7c03 100755 --- a/release-utils/appimage/appimage_after_bundle.sh +++ b/release-utils/appimage/appimage_after_bundle.sh @@ -8,4 +8,6 @@ LD_LIBRARY_PATH=$APPDIR/usr/lib/x86_64-linux-gnu \ python3.8 -m pip install poetry==1.5.1 && python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" certifi setuptools wheel && python3.8 -m poetry build && -python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" dist/*.whl +python3.8 -m poetry export --output requirements.txt && +python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r requirements.txt && +python3.8 -m pip install --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" dist/*.whl From c7f88684e29e966a5ccef234e383cfadbbbe292a Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 17:51:04 +0400 Subject: [PATCH 02/11] test --- .github/workflows/release.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 277e902c..19505947 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,6 +22,7 @@ jobs: pypi: needs: validate + if: false runs-on: ubuntu-22.04 permissions: id-token: write @@ -46,7 +47,8 @@ jobs: brew: # the Formula references the rclip package published to PyPI needs: [validate, parse_tag, pypi] - if: needs.parse_tag.outputs.is_stable_version == 'true' + # if: needs.parse_tag.outputs.is_stable_version == 'true' + if: false runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -68,6 +70,7 @@ jobs: snap: needs: [validate, parse_tag] + if: false runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -144,7 +147,8 @@ jobs: windows: needs: [parse_tag, validate] - if: needs.parse_tag.outputs.is_stable_version == 'true' + # if: needs.parse_tag.outputs.is_stable_version == 'true' + if: false runs-on: windows-2022 steps: - uses: actions/checkout@v3 @@ -183,7 +187,8 @@ jobs: create_release: needs: [parse_tag, pypi, snap, appimage, windows] # the windows job doesn't run for pre-releases, but we need to create a release for pre-releases too - if: ${{ !cancelled() }} + # if: ${{ !cancelled() }} + if: false runs-on: ubuntu-22.04 steps: # if any of the needs jobs fail, we don't want to create a release From 5eb4fb7efda498abb43354303bfc79325510ab2a Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 17:51:20 +0400 Subject: [PATCH 03/11] release: v1.7.26a0 --- pyproject.toml | 2 +- snap/snapcraft.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 43db5216..ec67ebda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.7.25" +version = "1.7.26a0" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e4043d49..5279e22b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,7 +10,7 @@ description: | For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw. You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme. -version: 1.7.25 +version: 1.7.26a0 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -33,7 +33,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.7.25.tar.gz + source: ./snap/local/rclip-1.7.26a0.tar.gz build-packages: - python3-pip build-environment: From 6a5fd1f59ad03312d3ebf53dd422e348bd3d8be1 Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:00:38 +0400 Subject: [PATCH 04/11] bump poetry --- release-utils/appimage/appimage_after_bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-utils/appimage/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh index 319b7c03..b2489421 100755 --- a/release-utils/appimage/appimage_after_bundle.sh +++ b/release-utils/appimage/appimage_after_bundle.sh @@ -5,7 +5,7 @@ set -e PYTHONHOME=$APPDIR/usr \ PYTHONPATH=$APPDIR/usr/lib/python3.8/site-packages:$APPDIR/usr/lib/python3.8 \ LD_LIBRARY_PATH=$APPDIR/usr/lib/x86_64-linux-gnu \ -python3.8 -m pip install poetry==1.5.1 && +python3.8 -m pip install poetry==1.7.1 && python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" certifi setuptools wheel && python3.8 -m poetry build && python3.8 -m poetry export --output requirements.txt && From e65dcfe1278f74adee744411af3d9bd9155e023a Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:01:31 +0400 Subject: [PATCH 05/11] release: v1.7.26a1 --- pyproject.toml | 2 +- snap/snapcraft.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ec67ebda..41401dbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.7.26a0" +version = "1.7.26a1" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 5279e22b..68bd8f82 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,7 +10,7 @@ description: | For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw. You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme. -version: 1.7.26a0 +version: 1.7.26a1 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -33,7 +33,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.7.26a0.tar.gz + source: ./snap/local/rclip-1.7.26a1.tar.gz build-packages: - python3-pip build-environment: From d06897fe55f8d598b49ea540bc33ef81a78dc0e7 Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:25:32 +0400 Subject: [PATCH 06/11] test --- release-utils/appimage/appimage_after_bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-utils/appimage/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh index b2489421..423c3596 100755 --- a/release-utils/appimage/appimage_after_bundle.sh +++ b/release-utils/appimage/appimage_after_bundle.sh @@ -10,4 +10,4 @@ python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --pr python3.8 -m poetry build && python3.8 -m poetry export --output requirements.txt && python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r requirements.txt && -python3.8 -m pip install --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" dist/*.whl +python3.8 -m pip install --isolated --no-input --prefix="$APPDIR/usr" dist/*.whl From e515d1f9b13289f52383ff73aa8e6af9cff5daa3 Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:25:38 +0400 Subject: [PATCH 07/11] release: v1.7.26a2 --- pyproject.toml | 2 +- snap/snapcraft.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 41401dbe..aa363cfb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.7.26a1" +version = "1.7.26a2" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 68bd8f82..0cd525a8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,7 +10,7 @@ description: | For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw. You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme. -version: 1.7.26a1 +version: 1.7.26a2 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -33,7 +33,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.7.26a1.tar.gz + source: ./snap/local/rclip-1.7.26a2.tar.gz build-packages: - python3-pip build-environment: From 56d00e9e36aa2ba5338ae6ab1ba2780750a2c6e6 Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:32:52 +0400 Subject: [PATCH 08/11] release: v1.7.26a3 --- pyproject.toml | 2 +- release-utils/appimage/appimage_after_bundle.sh | 2 +- snap/snapcraft.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index aa363cfb..82d27bff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.7.26a2" +version = "1.7.26a3" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/release-utils/appimage/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh index 423c3596..50cfebe9 100755 --- a/release-utils/appimage/appimage_after_bundle.sh +++ b/release-utils/appimage/appimage_after_bundle.sh @@ -10,4 +10,4 @@ python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --pr python3.8 -m poetry build && python3.8 -m poetry export --output requirements.txt && python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r requirements.txt && -python3.8 -m pip install --isolated --no-input --prefix="$APPDIR/usr" dist/*.whl +python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" dist/*.whl diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0cd525a8..bc0ee5ab 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,7 +10,7 @@ description: | For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw. You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme. -version: 1.7.26a2 +version: 1.7.26a3 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -33,7 +33,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.7.26a2.tar.gz + source: ./snap/local/rclip-1.7.26a3.tar.gz build-packages: - python3-pip build-environment: From a30da33c2156cd28bcf9195992afb48a0ed62e6c Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:40:00 +0400 Subject: [PATCH 09/11] release: v1.7.26a4 --- pyproject.toml | 2 +- release-utils/appimage/appimage_after_bundle.sh | 2 +- snap/snapcraft.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 82d27bff..2ec61428 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.7.26a3" +version = "1.7.26a4" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/release-utils/appimage/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh index 50cfebe9..f76766dd 100755 --- a/release-utils/appimage/appimage_after_bundle.sh +++ b/release-utils/appimage/appimage_after_bundle.sh @@ -10,4 +10,4 @@ python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --pr python3.8 -m poetry build && python3.8 -m poetry export --output requirements.txt && python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r requirements.txt && -python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" dist/*.whl +python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --isolated --no-input --prefix="$APPDIR/usr" dist/*.whl diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index bc0ee5ab..be4fbb70 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,7 +10,7 @@ description: | For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw. You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme. -version: 1.7.26a3 +version: 1.7.26a4 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -33,7 +33,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.7.26a3.tar.gz + source: ./snap/local/rclip-1.7.26a4.tar.gz build-packages: - python3-pip build-environment: From ca08e1158f6d01032b4d8380a8a0ebce37444cae Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:41:07 +0400 Subject: [PATCH 10/11] release: v1.7.26a5 --- pyproject.toml | 2 +- release-utils/appimage/appimage_after_bundle.sh | 2 +- snap/snapcraft.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2ec61428..0721a02f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.7.26a4" +version = "1.7.26a5" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/release-utils/appimage/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh index f76766dd..ec7ed6ef 100755 --- a/release-utils/appimage/appimage_after_bundle.sh +++ b/release-utils/appimage/appimage_after_bundle.sh @@ -10,4 +10,4 @@ python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --pr python3.8 -m poetry build && python3.8 -m poetry export --output requirements.txt && python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r requirements.txt && -python3.8 -m pip install --extra-index-url https://download.pytorch.org/whl/cpu --isolated --no-input --prefix="$APPDIR/usr" dist/*.whl +python3.8 -m pip install --no-dependencies --isolated --no-input --prefix="$APPDIR/usr" dist/*.whl diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index be4fbb70..21fc879c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,7 +10,7 @@ description: | For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw. You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme. -version: 1.7.26a4 +version: 1.7.26a5 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -33,7 +33,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.7.26a4.tar.gz + source: ./snap/local/rclip-1.7.26a5.tar.gz build-packages: - python3-pip build-environment: From 661e8d208e4e1c365d469c551de49f2d3233aa3b Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Sun, 18 Feb 2024 18:54:41 +0400 Subject: [PATCH 11/11] Revert "test" This reverts commit c7f88684e29e966a5ccef234e383cfadbbbe292a. --- .github/workflows/release.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 19505947..277e902c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,6 @@ jobs: pypi: needs: validate - if: false runs-on: ubuntu-22.04 permissions: id-token: write @@ -47,8 +46,7 @@ jobs: brew: # the Formula references the rclip package published to PyPI needs: [validate, parse_tag, pypi] - # if: needs.parse_tag.outputs.is_stable_version == 'true' - if: false + if: needs.parse_tag.outputs.is_stable_version == 'true' runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -70,7 +68,6 @@ jobs: snap: needs: [validate, parse_tag] - if: false runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -147,8 +144,7 @@ jobs: windows: needs: [parse_tag, validate] - # if: needs.parse_tag.outputs.is_stable_version == 'true' - if: false + if: needs.parse_tag.outputs.is_stable_version == 'true' runs-on: windows-2022 steps: - uses: actions/checkout@v3 @@ -187,8 +183,7 @@ jobs: create_release: needs: [parse_tag, pypi, snap, appimage, windows] # the windows job doesn't run for pre-releases, but we need to create a release for pre-releases too - # if: ${{ !cancelled() }} - if: false + if: ${{ !cancelled() }} runs-on: ubuntu-22.04 steps: # if any of the needs jobs fail, we don't want to create a release