From 5380a0ba1eb7172c745017e53cfa83b08d6a14e7 Mon Sep 17 00:00:00 2001
From: Greg Magolan <greg@aspect.dev>
Date: Tue, 30 Jan 2024 18:35:23 -0800
Subject: [PATCH] chore: upgrade to Aspect Workflows 5.9.0

---
 .aspect/workflows/deps.bzl               | 10 ++++-----
 .aspect/workflows/terraform/workflows.tf |  2 +-
 .circleci/config.yml                     | 28 ++++++++++++------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.aspect/workflows/deps.bzl b/.aspect/workflows/deps.bzl
index 915d7ee08..4f7b75416 100644
--- a/.aspect/workflows/deps.bzl
+++ b/.aspect/workflows/deps.bzl
@@ -4,12 +4,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", _http_archive = "http_archi
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 # TODO: move this to a rule set so repositories on Aspect Workflows can avoid this boilerplate
-rosetta_version = "5.9.0-rc.19"
+rosetta_version = "5.9.0"
 rosetta_integrity = {
-    "darwin_aarch64": "sha256-5pw7bZTuRhmUcspbu1mxEcY/mGRS3WpcU6dXbXBXL0k=",
-    "darwin_x86_64": "sha256-rO1UC2F9t44LKAf5BotHm7K0Dd1HvDUy3GDtbe1Q7KQ=",
-    "linux_aarch64": "sha256-n+hsJe9HE/5xyjTZKCoeAFFNIs+CMM3YwlBfElXj6Zk=",
-    "linux_x86_64": "sha256-7ADACe8Q2riUkxzwpuNvfLWGw2RRD19zP3m96UloAaQ=",
+    "darwin_aarch64": "sha256-evvaKQ2Wz6Hi8F82pLCBe1qYsTPBVEHCkJRqWvkpvgU=",
+    "darwin_x86_64": "sha256-ttlFMEYs2Ya5ykYbOCiW7afB0EZItMOgs1uT/Lf92Wc=",
+    "linux_aarch64": "sha256-Yywq2MF8Gg3Rl/LQjGGT8MJf6OzT9IQJYkyW6Hb3J0w=",
+    "linux_x86_64": "sha256-f2uy4Gy/sVStb5U0M7q/LsNroni2zWAa6AlrjvPQooQ=",
 }
 
 # https://github.com/suzuki-shunsuke/circleci-config-merge/releases
diff --git a/.aspect/workflows/terraform/workflows.tf b/.aspect/workflows/terraform/workflows.tf
index 1c94d0a57..05da01081 100644
--- a/.aspect/workflows/terraform/workflows.tf
+++ b/.aspect/workflows/terraform/workflows.tf
@@ -16,7 +16,7 @@ module "aspect_workflows" {
   region  = local.region
 
   # Aspect Workflows terraform module
-  source = "https://s3.us-east-2.amazonaws.com/static.aspect.build/aspect/5.9.0-rc.19/workflows-gcp/terraform-gcp-aspect-workflows.zip"
+  source = "https://s3.us-east-2.amazonaws.com/static.aspect.build/aspect/5.9.0/terraform-gcp-aspect-workflows.zip"
 
   # Network properties
   network    = google_compute_network.workflows_network.id
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 109f8abdb..735d4ba09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,8 +9,8 @@ workflows:
         filters:
           branches:
             only:
-            - main
-            - aspect-build/test-delivery
+            - /^main$/
+            - /^aspect-build\/test-delivery$/
         requires:
         - aw-root_workspace_test
     - aw-buildifier:
@@ -550,12 +550,12 @@ jobs:
           and:
           - <<parameters.delivery_manifest>>
           - or:
-            - equal:
-              - main
-              - << pipeline.git.branch >>
-            - equal:
-              - aspect-build/test-delivery
-              - << pipeline.git.branch >>
+            - matches:
+                pattern: ^main$
+                value: << pipeline.git.branch >>
+            - matches:
+                pattern: ^aspect-build\/test-delivery$
+                value: << pipeline.git.branch >>
         steps:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
@@ -640,12 +640,12 @@ jobs:
           and:
           - <<parameters.delivery_manifest>>
           - or:
-            - equal:
-              - main
-              - << pipeline.git.branch >>
-            - equal:
-              - aspect-build/test-delivery
-              - << pipeline.git.branch >>
+            - matches:
+                pattern: ^main$
+                value: << pipeline.git.branch >>
+            - matches:
+                pattern: ^aspect-build\/test-delivery$
+                value: << pipeline.git.branch >>
         steps:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace