Skip to content

Commit 36b8efa

Browse files
fix publishing for docker auth & pypi name
1 parent 475f9c4 commit 36b8efa

File tree

9 files changed

+24
-14
lines changed

9 files changed

+24
-14
lines changed

.github/workflows/create-release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,12 @@ jobs:
184184
- name: Available platforms
185185
run: echo ${{ steps.buildx.outputs.platforms }}
186186

187+
- name: Login to DockerHub
188+
uses: docker/login-action@v2
189+
with:
190+
username: ${{ secrets.DOCKERHUB_USERNAME }}
191+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
192+
187193
- name: Build Release Docker and Publish
188194
uses: docker/build-push-action@v3
189195
with:
@@ -269,7 +275,7 @@ jobs:
269275
python3 -m twine upload --non-interactive --disable-progress-bar dist/*.whl
270276
271277
release:
272-
needs: [get_version, build_src,build_linux,build_macos,build_windows]
278+
needs: [get_version,build_src,build_linux,build_macos,build_windows]
273279
runs-on: ubuntu-20.04
274280
steps:
275281
- name: Checkout code

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
## 1.14.4 (2023-07-06)
6+
7+
- fix: docker auth during publishing
8+
59
## 1.14.3 (2023-07-06)
610

711
- add binary wheel without dependencies to pypi

EXPERIMENTAL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ Legacy command (compatible with prior versions):
3434

3535
`docker run -it --rm icloudpd:icloudpd icloud --help`
3636

37-
`icloudpd-1.14.3-windows-amd64 --help`
37+
`icloudpd-1.14.4-windows-amd64 --help`
3838

3939
Help:
4040

4141
`docker run -it --rm icloudpd:icloudpd`
4242

43-
`icloudpd-ex-1.14.3-windows-amd64 --help`
43+
`icloudpd-ex-1.14.4-windows-amd64 --help`
4444

4545
Example:
4646

4747
`docker run -it --rm icloudpd:icloudpd copy [email protected] /path/to/{album}/{date_created:%Y/%Y-%m}`
4848

49-
`icloudpd-ex-1.14.3-windows-amd64 copy [email protected] /path/to/{album}/{date_created:%Y/%Y-%m}`
49+
`icloudpd-ex-1.14.4-windows-amd64 copy [email protected] /path/to/{album}/{date_created:%Y/%Y-%m}`
5050

FAQ.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ iOS 16 feature to share libraries between accounts is [not supported](https://gi
5959

6060
Here are the steps to make it working:
6161
- download binary from Github [Releases](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases) into desired local folder
62-
- add executable flag by running `chmod +x icloudpd-1.14.3-macos-amd64`
63-
- start it from the terminal: `icloudpd-1.14.3-macos-amd64`
62+
- add executable flag by running `chmod +x icloudpd-1.14.4-macos-amd64`
63+
- start it from the terminal: `icloudpd-1.14.4-macos-amd64`
6464
- Apple will tell you that it cannot check for malicous software and refuse to run the app; click "Ok"
65-
- Open "System Settings"/"Privacy & Security" and find `icloudpd-1.14.3-macos-amd64` as blocked app; Click "Allow"
66-
- Start `icloudpd-1.14.3-macos-amd64` from the terminal again
65+
- Open "System Settings"/"Privacy & Security" and find `icloudpd-1.14.4-macos-amd64` as blocked app; Click "Allow"
66+
- Start `icloudpd-1.14.4-macos-amd64` from the terminal again
6767
- Apple will show another warning; click "Open"
68-
- After that you can run `icloudpd-1.14.3-macos-amd64 icloudpd --help` or any other supported command/option
68+
- After that you can run `icloudpd-1.14.4-macos-amd64 icloudpd --help` or any other supported command/option

binary_dist/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ requires = [
66
build-backend = "setuptools.build_meta"
77

88
[project]
9-
version="1.14.3"
9+
version="1.14.4"
1010
name = "icloudpd"
1111
description = "icloudpd is a command-line tool to download photos and videos from iCloud."
1212
readme = "README_PYPI.md"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ requires = [
66
build-backend = "setuptools.build_meta"
77

88
[project]
9-
version="1.14.3"
9+
version="1.14.4"
1010
name = "icloudpd"
1111
description = "icloudpd is a command-line tool to download photos and videos from iCloud."
1212
readme = "README_PYPI.md"

scripts/build_binary_dist_macos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cp dist/icloudpd-$1-macos-amd64 dist/binary_dist/src/icloudpd/icloudpd
1515
cp dist/icloud-$1-macos-amd64 dist/binary_dist/src/icloud/icloud
1616
python3 -m pip wheel dist/binary_dist/ -w dist/binary_dist --no-deps --no-build-isolation
1717

18-
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
18+
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

scripts/publish_pypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ set -euo pipefail
1111
# cleint use: pip install --index http://192.168.1.20:4880 --trusted-host 192.168.1.20 icloudpd
1212

1313
# linux
14-
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
14+
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

src/icloudpd/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
type=click.IntRange(1),
217217
)
218218
# a hacky way to get proper version because automatic detection does not work for some reason
219-
@click.version_option(version="1.14.3")
219+
@click.version_option(version="1.14.4")
220220
# pylint: disable-msg=too-many-arguments,too-many-statements
221221
# pylint: disable-msg=too-many-branches,too-many-locals
222222
def main(

0 commit comments

Comments
 (0)