From 9798f97e972ce3b44a656ce757fe6594d7219a58 Mon Sep 17 00:00:00 2001 From: Yurij Mikhalevich Date: Thu, 17 Aug 2023 11:56:19 +0400 Subject: [PATCH] chore: move appimage-related files under a subdir (#65) --- .github/workflows/release.yaml | 2 +- Makefile | 2 +- pyproject.toml | 2 +- .../appimage/appimage-builder.yml | 4 ++-- .../appimage/appimage_after_bundle.sh | 0 logo@256.png => release-utils/appimage/logo@256.png | Bin snap/snapcraft.yaml | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) rename appimage-builder.yml => release-utils/appimage/appimage-builder.yml (93%) rename appimage_after_bundle.sh => release-utils/appimage/appimage_after_bundle.sh (100%) rename logo@256.png => release-utils/appimage/logo@256.png (100%) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2f84aa0d..e3285d8a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -90,7 +90,7 @@ jobs: - name: Build AppImage uses: AppImageCrafters/build-appimage@v1.3 with: - recipe: './appimage-builder.yml' + recipe: './release-utils/appimage/appimage-builder.yml' env: APP_VERSION: ${{ steps.version.outputs.VERSION }} - name: Generate Changelog diff --git a/Makefile b/Makefile index 786055ad..0e9d54f1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ else endif build-appimage: - poetry run appimage-builder --recipe appimage-builder.yml + poetry run appimage-builder --recipe ./release-utils/appimage/appimage-builder.yml lint-style: poetry run pycodestyle . diff --git a/pyproject.toml b/pyproject.toml index dfbf3fe2..25c1f6aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.4.10" +version = "1.5.0a0" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/appimage-builder.yml b/release-utils/appimage/appimage-builder.yml similarity index 93% rename from appimage-builder.yml rename to release-utils/appimage/appimage-builder.yml index 5a27748f..f128ec95 100644 --- a/appimage-builder.yml +++ b/release-utils/appimage/appimage-builder.yml @@ -8,7 +8,7 @@ script: - mkdir -p AppDir/usr/src AppDir/usr/share/icons/hicolor/256x256/apps/ # Copy the python application code and icon into the AppDir - cp rclip AppDir/usr/src -r - - cp logo@256.png AppDir/usr/share/icons/hicolor/256x256/apps/rclip.png + - cp release-utils/appimage/logo@256.png AppDir/usr/share/icons/hicolor/256x256/apps/rclip.png AppDir: @@ -45,7 +45,7 @@ AppDir: exclude: [] after_bundle: > - PATH=${APPDIR}/usr/bin:${PATH} ./appimage_after_bundle.sh + PATH=${APPDIR}/usr/bin:${PATH} ./release-utils/appimage/appimage_after_bundle.sh runtime: env: diff --git a/appimage_after_bundle.sh b/release-utils/appimage/appimage_after_bundle.sh similarity index 100% rename from appimage_after_bundle.sh rename to release-utils/appimage/appimage_after_bundle.sh diff --git a/logo@256.png b/release-utils/appimage/logo@256.png similarity index 100% rename from logo@256.png rename to release-utils/appimage/logo@256.png diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 18b462cc..dc9925dd 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.4.10 +version: 1.5.0a0 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.4.10.tar.gz + source: ./snap/local/rclip-1.5.0a0.tar.gz build-packages: - python3-pip build-environment: