diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 55444a16a..365d624e4 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -184,6 +184,12 @@ jobs: - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Build Release Docker and Publish uses: docker/build-push-action@v3 with: @@ -269,7 +275,7 @@ jobs: python3 -m twine upload --non-interactive --disable-progress-bar dist/*.whl release: - needs: [get_version, build_src,build_linux,build_macos,build_windows] + needs: [get_version,build_src,build_linux,build_macos,build_windows] runs-on: ubuntu-20.04 steps: - name: Checkout code diff --git a/CHANGELOG.md b/CHANGELOG.md index cf61b5765..27b23bd61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## 1.14.4 (2023-07-06) + +- fix: docker auth during publishing + ## 1.14.3 (2023-07-06) - add binary wheel without dependencies to pypi diff --git a/EXPERIMENTAL.md b/EXPERIMENTAL.md index 9c7cd3713..56159256c 100644 --- a/EXPERIMENTAL.md +++ b/EXPERIMENTAL.md @@ -34,17 +34,17 @@ Legacy command (compatible with prior versions): `docker run -it --rm icloudpd:icloudpd icloud --help` -`icloudpd-1.14.3-windows-amd64 --help` +`icloudpd-1.14.4-windows-amd64 --help` Help: `docker run -it --rm icloudpd:icloudpd` -`icloudpd-ex-1.14.3-windows-amd64 --help` +`icloudpd-ex-1.14.4-windows-amd64 --help` Example: `docker run -it --rm icloudpd:icloudpd copy my@email.address /path/to/{album}/{date_created:%Y/%Y-%m}` -`icloudpd-ex-1.14.3-windows-amd64 copy my@email.address /path/to/{album}/{date_created:%Y/%Y-%m}` +`icloudpd-ex-1.14.4-windows-amd64 copy my@email.address /path/to/{album}/{date_created:%Y/%Y-%m}` diff --git a/FAQ.md b/FAQ.md index fc3e722f2..714dcc76d 100644 --- a/FAQ.md +++ b/FAQ.md @@ -59,10 +59,10 @@ iOS 16 feature to share libraries between accounts is [not supported](https://gi Here are the steps to make it working: - download binary from Github [Releases](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases) into desired local folder -- add executable flag by running `chmod +x icloudpd-1.14.3-macos-amd64` -- start it from the terminal: `icloudpd-1.14.3-macos-amd64` +- add executable flag by running `chmod +x icloudpd-1.14.4-macos-amd64` +- start it from the terminal: `icloudpd-1.14.4-macos-amd64` - Apple will tell you that it cannot check for malicous software and refuse to run the app; click "Ok" -- Open "System Settings"/"Privacy & Security" and find `icloudpd-1.14.3-macos-amd64` as blocked app; Click "Allow" -- Start `icloudpd-1.14.3-macos-amd64` from the terminal again +- Open "System Settings"/"Privacy & Security" and find `icloudpd-1.14.4-macos-amd64` as blocked app; Click "Allow" +- Start `icloudpd-1.14.4-macos-amd64` from the terminal again - Apple will show another warning; click "Open" -- After that you can run `icloudpd-1.14.3-macos-amd64 icloudpd --help` or any other supported command/option +- After that you can run `icloudpd-1.14.4-macos-amd64 icloudpd --help` or any other supported command/option diff --git a/binary_dist/pyproject.toml b/binary_dist/pyproject.toml index 87e4a6e00..687a38d99 100644 --- a/binary_dist/pyproject.toml +++ b/binary_dist/pyproject.toml @@ -6,7 +6,7 @@ requires = [ build-backend = "setuptools.build_meta" [project] -version="1.14.3" +version="1.14.4" name = "icloudpd" description = "icloudpd is a command-line tool to download photos and videos from iCloud." readme = "README_PYPI.md" diff --git a/pyproject.toml b/pyproject.toml index e67b49f9b..2d162d240 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = [ build-backend = "setuptools.build_meta" [project] -version="1.14.3" +version="1.14.4" name = "icloudpd" description = "icloudpd is a command-line tool to download photos and videos from iCloud." readme = "README_PYPI.md" diff --git a/scripts/build_binary_dist_macos b/scripts/build_binary_dist_macos index 4f24f1ca9..a401171a5 100755 --- a/scripts/build_binary_dist_macos +++ b/scripts/build_binary_dist_macos @@ -15,4 +15,4 @@ cp dist/icloudpd-$1-macos-amd64 dist/binary_dist/src/icloudpd/icloudpd cp dist/icloud-$1-macos-amd64 dist/binary_dist/src/icloud/icloud python3 -m pip wheel dist/binary_dist/ -w dist/binary_dist --no-deps --no-build-isolation -mv -f dist/binary_dist/icloudpd-$1-py2.py3-none-any.whl dist/icloudpd-$1-py2.py3-none-macos_11_x86_64.macos_arm64.whl \ No newline at end of file +mv -f dist/binary_dist/icloudpd-$1-py2.py3-none-any.whl dist/icloudpd-$1-py2.py3-none-macos_11_0_x86_64.macos_11_0_arm64.whl \ No newline at end of file diff --git a/scripts/publish_pypi b/scripts/publish_pypi index 8818de884..da4c7ba62 100755 --- a/scripts/publish_pypi +++ b/scripts/publish_pypi @@ -11,4 +11,4 @@ set -euo pipefail # cleint use: pip install --index http://192.168.1.20:4880 --trusted-host 192.168.1.20 icloudpd # linux -twine upload --repository-url $1 --non-interactive -u bogus -p bogus dist/icloudpd-1.14.3-py2.py3-none-manylinux*.whl dist/icloudpd-1.14.3-py2.py3-none-macos*.whl dist/icloudpd-1.14.3-py2.py3-none-win*.whl dist/icloudpd-1.14.3-py3-none-any.whl +twine upload --repository-url $1 --non-interactive -u bogus -p bogus dist/icloudpd-1.14.4-py2.py3-none-manylinux*.whl dist/icloudpd-1.14.4-py2.py3-none-macos*.whl dist/icloudpd-1.14.4-py2.py3-none-win*.whl dist/icloudpd-1.14.4-py3-none-any.whl diff --git a/src/icloudpd/base.py b/src/icloudpd/base.py index dc05ee4c2..29ca56416 100644 --- a/src/icloudpd/base.py +++ b/src/icloudpd/base.py @@ -216,7 +216,7 @@ type=click.IntRange(1), ) # a hacky way to get proper version because automatic detection does not work for some reason -@click.version_option(version="1.14.3") +@click.version_option(version="1.14.4") # pylint: disable-msg=too-many-arguments,too-many-statements # pylint: disable-msg=too-many-branches,too-many-locals def main(