diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5e9060d..06ec0ae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -70,7 +70,8 @@ jobs: needs: [validate, parse_tag] runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: canonical/setup-lxd@main - name: Configure git for "snapcraft remote-build" run: | git config --global user.email "yurij@mikhalevi.ch" @@ -93,9 +94,12 @@ jobs: mkdir snap/local cp -v dist/rclip-*.tar.gz snap/local - run: sudo snap install snapcraft --classic - - run: | + - name: Build arm64 snap remotely + run: | export SNAPCRAFT_REMOTE_BUILD_STRATEGY="force-fallback" - snapcraft remote-build --launchpad-accept-public-upload + snapcraft remote-build --launchpad-accept-public-upload --build-for arm64 + - name: Build amd64 snap locally + run: snapcraft --use-lxd --build-for amd64 - name: Validate built snap run: | sudo snap install rclip_*_amd64.snap --dangerous diff --git a/pyproject.toml b/pyproject.toml index 53c34aa..2828316 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rclip" -version = "1.11.1a3" +version = "1.11.1a12" description = "AI-Powered Command-Line Photo Search Tool" authors = ["Yurij Mikhalevich "] license = "MIT" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c1752fe..1fe917c 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.11.1a3 +version: 1.11.1a12 website: https://github.com/yurijmikhalevich/rclip contact: yurij@mikhalevi.ch passthrough: @@ -19,9 +19,6 @@ passthrough: grade: stable confinement: strict base: core22 -architectures: - - build-on: [amd64] - - build-on: [arm64] apps: rclip: @@ -31,7 +28,7 @@ apps: parts: rclip: plugin: python - source: ./snap/local/rclip-1.11.1a3.tar.gz + source: ./snap/local/rclip-1.11.1a12.tar.gz build-packages: - python3-pip build-environment: