From dce063722def9b14a39dee1e22fdc273d30f2b2f Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 4 Mar 2024 13:38:50 -0800
Subject: [PATCH] chore: fix circleci yaml generation for artifact path storage
 (#777)

---
 .circleci/BUILD.bazel |  2 +-
 .circleci/config.yml  | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.circleci/BUILD.bazel b/.circleci/BUILD.bazel
index edd7dd7d4..6dfea2a0e 100644
--- a/.circleci/BUILD.bazel
+++ b/.circleci/BUILD.bazel
@@ -36,7 +36,7 @@ genrule(
     name = "aspect_workflows_config",
     srcs = ["//.aspect/workflows:config.yaml"],
     outs = [":aspect-workflows-config.yml"],
-    cmd = "CIRCLE_PROJECT_USERNAME={0} $(execpath :rosetta) steps --configuration .aspect/workflows/config.yaml --host circleci > $@".format(CIRCLECI_ORG),
+    cmd = "CI=1 CIRCLE_PROJECT_USERNAME={0} $(execpath :rosetta) steps --configuration .aspect/workflows/config.yaml --host circleci > $@".format(CIRCLECI_ORG),
     target_compatible_with = not_windows,
     tools = [":rosetta"],
 )
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6895e37fb..d553cc6fa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -195,7 +195,7 @@ jobs:
         name: Configure Workflows
     - checkout
     - run:
-        command: rm -rf /some/path/artifacts /some/path/testlogs
+        command: rm -rf /workflows/artifacts /workflows/testlogs
         environment:
           ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
           CC: /bin/false
@@ -226,7 +226,7 @@ jobs:
         name: Buildifier
         no_output_timeout: 180m
     - store_artifacts:
-        path: /some/path/artifacts
+        path: /workflows/artifacts
     - run:
         command: rosetta run finalization
         environment:
@@ -260,7 +260,7 @@ jobs:
         name: Configure Workflows
     - checkout
     - run:
-        command: rm -rf /some/path/artifacts /some/path/testlogs
+        command: rm -rf /workflows/artifacts /workflows/testlogs
         environment:
           ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
           CC: /bin/false
@@ -291,7 +291,7 @@ jobs:
         name: Configure
         no_output_timeout: 180m
     - store_artifacts:
-        path: /some/path/artifacts
+        path: /workflows/artifacts
     - run:
         command: rosetta run finalization
         environment:
@@ -325,7 +325,7 @@ jobs:
         name: Configure Workflows
     - checkout
     - run:
-        command: rm -rf /some/path/artifacts /some/path/testlogs
+        command: rm -rf /workflows/artifacts /workflows/testlogs
         environment:
           ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
           CC: /bin/false
@@ -356,7 +356,7 @@ jobs:
         name: Format
         no_output_timeout: 180m
     - store_artifacts:
-        path: /some/path/artifacts
+        path: /workflows/artifacts
     - run:
         command: rosetta run finalization
         environment:
@@ -390,7 +390,7 @@ jobs:
         name: Configure Workflows
     - checkout
     - run:
-        command: rm -rf /some/path/artifacts /some/path/testlogs
+        command: rm -rf /workflows/artifacts /workflows/testlogs
         environment:
           ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
           CC: /bin/false
@@ -421,7 +421,7 @@ jobs:
         name: Gazelle
         no_output_timeout: 180m
     - store_artifacts:
-        path: /some/path/artifacts
+        path: /workflows/artifacts
     - run:
         command: rosetta run finalization
         environment:
@@ -512,7 +512,7 @@ jobs:
         name: Configure Workflows
     - checkout
     - run:
-        command: rm -rf /some/path/artifacts /some/path/testlogs
+        command: rm -rf /workflows/artifacts /workflows/testlogs
         environment:
           ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
           CC: /bin/false
@@ -543,7 +543,7 @@ jobs:
         name: Test
         no_output_timeout: 180m
     - store_test_results:
-        path: /some/path/testlogs
+        path: /workflows/testlogs
     - when:
         condition:
           and:
@@ -563,9 +563,9 @@ jobs:
             name: Delivery Manifest
             no_output_timeout: 180m
     - store_artifacts:
-        path: /some/path/testlogs
+        path: /workflows/testlogs
     - store_artifacts:
-        path: /some/path/artifacts
+        path: /workflows/artifacts
     - run:
         command: rosetta run finalization
         environment:
@@ -599,7 +599,7 @@ jobs:
         name: Configure Workflows
     - checkout
     - run:
-        command: rm -rf /some/path/artifacts /some/path/testlogs
+        command: rm -rf /workflows/artifacts /workflows/testlogs
         environment:
           ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
           CC: /bin/false
@@ -630,7 +630,7 @@ jobs:
         name: Test
         no_output_timeout: 180m
     - store_test_results:
-        path: /some/path/testlogs
+        path: /workflows/testlogs
     - when:
         condition:
           and:
@@ -650,9 +650,9 @@ jobs:
             name: Delivery Manifest
             no_output_timeout: 180m
     - store_artifacts:
-        path: /some/path/testlogs
+        path: /workflows/testlogs
     - store_artifacts:
-        path: /some/path/artifacts
+        path: /workflows/artifacts
     - run:
         command: rosetta run finalization
         environment: