RUMM-1744 Cleanup

DataDog · Jan 3, 2022 · ce488b6 · ce488b6
1 parent f40de15
commit ce488b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/tools/distribution/release.py b/tools/distribution/release.py
@@ -16,6 +16,7 @@
 from src.git import clone_repo
 from src.assets.gh_asset import GHAsset
 from src.assets.podspec import CPPodspec
+from src.semver import Version
 
 DD_SDK_IOS_REPO_SSH = 'git@github.com:DataDog/dd-sdk-ios.git'
 DD_SDK_IOS_REPO_NAME = 'dd-sdk-ios'
@@ -83,6 +84,8 @@
               f'- overwrite_github  = {overwrite_github}\n'
               f'- dry_run           = {dry_run}.')
 
+        print(f'🛠️ Git tag read to version: {Version.parse(git_tag)}')
+
         publish_to_gh = not only_cocoapods
         publish_to_cp = not only_github
 

diff --git a/tools/distribution/src/assets/gh_asset.py b/tools/distribution/src/assets/gh_asset.py
@@ -160,15 +160,15 @@ def __init__(self):
 
             # Produce XCFrameworks with carthage:
             # - only checkout and `--no-build` as it will build in the next command:
-            shell('carthage bootstrap --platform iOS --no-build', skip=True)
+            shell('carthage bootstrap --platform iOS --no-build')
             # - `--no-build` as it will build in the next command:
-            shell('carthage build --platform iOS --use-xcframeworks --no-use-binaries --no-skip-current', skip=True)
+            shell('carthage build --platform iOS --use-xcframeworks --no-use-binaries --no-skip-current')
 
         # Create `.zip` archive:
         zip_archive_name = f'Datadog-{read_sdk_version()}.zip'
         with remember_cwd():
             os.chdir('Carthage/Build')
-            shell(f'zip -q --symlinks -r {zip_archive_name} *.xcframework', skip=True)
+            shell(f'zip -q --symlinks -r {zip_archive_name} *.xcframework')
 
         self.__path = f'{os.getcwd()}/Carthage/Build/{zip_archive_name}'
         print('   → GH asset created')

diff --git a/tools/distribution/src/directory_matcher.py b/tools/distribution/src/directory_matcher.py
@@ -31,7 +31,6 @@ def assert_it_has_file(self, file_path: str):
         search_path = os.path.join(self.path, file_path)
         result = list(glob.iglob(search_path, recursive=True))
 
-        # if not os.path.exists(os.path.join(self.path, file_path)):
         if not result:
             raise DirectoryMatcherException(f'Expected "{self.path}" to include {file_path}, but it is missing.')