From b01714f80404c0e1c4c3492a58bfd4dd24e71d09 Mon Sep 17 00:00:00 2001 From: Andrey Nikiforov Date: Sat, 4 Feb 2023 09:15:45 -0800 Subject: [PATCH] add arm v7 and v6 (#567) --- .github/workflows/create-release.yml | 2 +- .github/workflows/docker-build.yml | 63 ++++++++++++++++++++++++++++ .github/workflows/quality-checks.yml | 2 +- CHANGELOG.md | 2 + 4 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/docker-build.yml diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 3ad9cc897..15550e8bc 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -112,7 +112,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/386 + platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/arm/v6 push: true tags: | icloudpd/icloudpd:latest diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml new file mode 100644 index 000000000..85aaa0aa0 --- /dev/null +++ b/.github/workflows/docker-build.yml @@ -0,0 +1,63 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions + +name: Docker Build + +on: + pull_request: + # branches: [ master ] + workflow_dispatch: + +jobs: + + get_version: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Retrieve version and Changelog + id: get_version + run: | + echo icloudpd_version=$(cat setup.py | grep version= | cut -d'"' -f 2) >> $GITHUB_OUTPUT + echo 'icloudpd_changelog<> $GITHUB_OUTPUT + scripts/extract_releasenotes CHANGELOG.md >> $GITHUB_OUTPUT + echo 'EOF' >> $GITHUB_OUTPUT + + - name: Log version and Changelog + run: | + echo "icloudpd_version=${{steps.get_version.outputs.icloudpd_version}}" + echo "icloudpd_changelog=${{steps.get_version.outputs.icloudpd_changelog}}" + + outputs: + icloudpd_version: ${{steps.get_version.outputs.icloudpd_version}} + icloudpd_changelog: ${{steps.get_version.outputs.icloudpd_changelog}} + + build_docker: + runs-on: ubuntu-latest + needs: [get_version] + + steps: + - uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Builder instance name + run: echo ${{ steps.buildx.outputs.name }} + + - name: Available platforms + run: echo ${{ steps.buildx.outputs.platforms }} + + - name: Build Release Docker + uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/arm/v6 + push: false + tags: | + icloudpd/icloudpd:latest + icloudpd/icloudpd:${{needs.get_version.outputs.icloudpd_version}} diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index f141bf89b..99af25cf7 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -132,7 +132,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/386 + platforms: linux/amd64 push: false tags: | icloudpd/icloudpd:latest diff --git a/CHANGELOG.md b/CHANGELOG.md index a909e8ea3..6034dcc40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- feature: add `linux/arm/v7` and `linux/arm/v6` docker image [#434](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/434) + ## 1.8.1 (2023-02-03) - fix: avoid crash when downloading over legacy `-original` name [#338](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/338)