From dbe3812c32ec4eb05b8fe45ca81b9a9b0b3d6926 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 12 Jun 2024 12:35:50 -0400 Subject: [PATCH 1/3] chore: remove temp debug logs --- tubular/scripts/frontend_utils.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tubular/scripts/frontend_utils.py b/tubular/scripts/frontend_utils.py index 711fc93d..d3118e58 100755 --- a/tubular/scripts/frontend_utils.py +++ b/tubular/scripts/frontend_utils.py @@ -274,18 +274,6 @@ def _upload_js_sourcemaps(self, app_dist): # Could not determine appropriate service or version for app; skipping. return - # [DEBUG] Temporarily log the current working directory - cwd = os.getcwd() - self.LOG(f'[DEBUG] Current working directory: {cwd}') - - # [DEBUG] Temporarily log the files in `app_dist` to observe which files are returned. - dist_files = os.listdir(app_dist) - self.LOG(f'[DEBUG] app_dist contents: {dist_files}') - - # [DEBUG] Temporarily log the files in current working directory to observe which files are returned. - cwd_files = os.listdir(cwd) - self.LOG(f'[DEBUG] current working directory contents: {cwd_files}') - command_args = ' '.join([ f'--service="{service}"', f'--release-version="{version}"', From a5798c4a9b505930ef0c4796ede2e9c0c2bc5b44 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 12 Jun 2024 12:43:58 -0400 Subject: [PATCH 2/3] chore: disable git in datadog-ci JS sourcemaps upload --- tubular/scripts/frontend_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tubular/scripts/frontend_utils.py b/tubular/scripts/frontend_utils.py index d3118e58..a26e773c 100755 --- a/tubular/scripts/frontend_utils.py +++ b/tubular/scripts/frontend_utils.py @@ -279,6 +279,7 @@ def _upload_js_sourcemaps(self, app_dist): f'--release-version="{version}"', f'--project-path="{self.app_name}/"', '--minified-path-prefix="/"', # Sourcemaps are relative to the root when deployed + '--disable-git', ]) self.LOG('Uploading source maps to Datadog for app {}.'.format(self.app_name)) proc = subprocess.Popen( From 6ee44b52977ceee96232fe7e0d5391511eebfc4d Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 12 Jun 2024 12:47:19 -0400 Subject: [PATCH 3/3] chore: disable git in datadog-ci JS sourcemaps upload --- tubular/scripts/frontend_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubular/scripts/frontend_utils.py b/tubular/scripts/frontend_utils.py index a26e773c..aab22847 100755 --- a/tubular/scripts/frontend_utils.py +++ b/tubular/scripts/frontend_utils.py @@ -279,7 +279,7 @@ def _upload_js_sourcemaps(self, app_dist): f'--release-version="{version}"', f'--project-path="{self.app_name}/"', '--minified-path-prefix="/"', # Sourcemaps are relative to the root when deployed - '--disable-git', + '--disable-git', # Disable Datadog's git integration as the current working directory is not a git repo ]) self.LOG('Uploading source maps to Datadog for app {}.'.format(self.app_name)) proc = subprocess.Popen(