Fix non linux builds and add --version to icloud (#1231)

Author: AndreyNikiforov

.github/workflows/build-package.yml

@@ -575,7 +575,7 @@ jobs:
 
     - name: Build Release Executables
       run: |
-        scripts/build_bin2 icloudpd icloud  && \
+        scripts/build_bin1 icloudpd && \
         scripts/build_bin1 icloud && \
         mv dist/icloud dist/icloud-${{inputs.icloudpd_version}}-macos-amd64 && \
         mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64
@@ -621,7 +621,7 @@ jobs:
 
     - name: Build Release Executables
       run: |
-        scripts/build_bin2 icloudpd icloud  && \
+        scripts/build_bin1 icloudpd && \
         scripts/build_bin1 icloud && \
         mv dist/icloud dist/icloud-${{inputs.icloudpd_version}}-windows-amd64 && \
         mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-windows-amd64

CONTRIBUTING.md

@@ -121,7 +121,7 @@ scripts/build
 Building platform executables:
 
 ``` sh
-scripts/build_bin2 icloudpd icloud
+scripts/build_bin1 icloudpd
 scripts/build_bin1 icloud
 ```
 Note: that command is for Linux, including devcontainers. Windows & macOS scripts must be executed on respective platforms.

scripts/build_bin2

@@ -11,6 +11,7 @@
 from typing import NoReturn, Sequence
 
 from foundation.core import identity
+from foundation import version_info_formatted
 from pyicloud_ipd.base import PyiCloudService
 from pyicloud_ipd.exceptions import PyiCloudFailedLoginException
 from pyicloud_ipd.file_match import FileMatchPolicy
@@ -178,8 +179,19 @@ def main(args: Sequence[str] | None = None) -> NoReturn:
         help="Root domain for requests to iCloud. com or cn",
     )
 
+    parser.add_argument(
+        "--version",
+        action="store_true",
+        dest="version",
+        help="Show the version, commit hash and timestamp",
+    )
+
     command_line = parser.parse_args(args)
 
+    if command_line.version:
+        print(version_info_formatted())
+        sys.exit(0)
+
     username: str | None = command_line.username.strip() or None
     password: str | None = command_line.password.strip() or None
     domain = command_line.domain