From 17a4033ccded8436b677fb8b739547c65a2a79c0 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 12 Jan 2024 17:55:28 -0800 Subject: [PATCH] chore: upgrade to Aspect Workflows 5.9.0-rc.15 --- .aspect/workflows/terraform/.terraform.lock.hcl | 6 ++++++ .aspect/workflows/terraform/main.tf | 2 +- .aspect/workflows/terraform/workflows.tf | 2 +- .../workflows/.aspect-workflows-reusable.yaml | 16 ++++++++-------- .github/workflows/aspect-workflows-delivery.yaml | 6 +++--- .github/workflows/aspect-workflows-warming.yaml | 2 +- .github/workflows/deps.bzl | 4 ++-- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.aspect/workflows/terraform/.terraform.lock.hcl b/.aspect/workflows/terraform/.terraform.lock.hcl index 511bce2..8ed365b 100644 --- a/.aspect/workflows/terraform/.terraform.lock.hcl +++ b/.aspect/workflows/terraform/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/hashicorp/google" { version = "4.81.0" constraints = ">= 3.53.0, >= 4.63.1, < 5.0.0" hashes = [ + "h1:TKydY88LYRsHJ05icwCU0NNy8ANWinWcs5teuSXVF2k=", "h1:nD0kJSonVXFC1y5blicnLEsGYSkaC7T1zTVig+gI1Dk=", "h1:nalbTQAn81Spx5arUAAj0N2tbUB7qXywYYm36WA+LQI=", "zh:29f5ca33cba63fb8dd96a0074317295bb99708a8d5bc124efe41406f25e967cd", @@ -26,6 +27,7 @@ provider "registry.terraform.io/hashicorp/google-beta" { version = "4.81.0" constraints = "< 5.0.0" hashes = [ + "h1:ccLmnfXRD7NgTmoezt29Z+Kj46vFfbvJBwlwI+Bv/fE=", "h1:i5GmPolFtcYUE7ZN9P95FkU6MHhfn5SQRbkeesytCYU=", "h1:ib1pat/Ok69ZeonZ7kdTLRtT8FPJP0+UF75ZT6TYf5w=", "zh:2177e06b4f6e7ea85bf475bc7c7012f94835f85237b8880fced6ede60279559d", @@ -47,6 +49,7 @@ provider "registry.terraform.io/hashicorp/helm" { version = "2.11.0" constraints = ">= 2.9.0" hashes = [ + "h1:AOp9vXIM4uT1c/PVwsWTPiLVGlO2SSYrfiirV5rjCMQ=", "h1:FGGkgKf12zBjPjrD0ANq7EhywWM00PvYYw7OTdT/Kq4=", "h1:zxfRtgpWrVZwjkIBuI+7jc52+u1QBA/k7LQZiCiq3Z8=", "zh:013857c88f3e19a4b162344e21dc51891c4ac8b600da8391f7fb2b6d234961e1", @@ -68,6 +71,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.23.0" constraints = ">= 2.0.1" hashes = [ + "h1:arTzD0XG/DswGCAx9JEttkSKe9RyyFW9W7UWcXF13dU=", "h1:cMs2scNCSgQhGamomGT5Ag4i8ms/mql1AR7NJc2hmbA=", "h1:xyFc77aYkPoU4Xt1i5t0B1IaS8TbTtp9aCSuQKDayII=", "zh:10488a12525ed674359585f83e3ee5e74818b5c98e033798351678b21b2f7d89", @@ -89,6 +93,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.4.3" constraints = "~> 3.4.3" hashes = [ + "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", "h1:tL3katm68lX+4lAncjQA9AXL4GR/VM+RPwqYf4D2X8Q=", "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", @@ -111,6 +116,7 @@ provider "registry.terraform.io/hashicorp/time" { hashes = [ "h1:NUv/YtEytDQncBQ2mTxnUZEy/rmDlPYmE9h2iokR0vk=", "h1:UHcDnIYFZ00uoou0TwPGMwOrE8gTkoRephIvdwDAK70=", + "h1:VxyoYYOCaJGDmLz4TruZQTSfQhvwEcMxvcKclWdnpbs=", "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f", "zh:3007f8fc4a4f8614c43e8ef1d4b0c773a5de1dcac50e701d8abc9fdc8fcb6bf5", "zh:5f79d0730fdec8cb148b277de3f00485eff3e9cf1ff47fb715b1c969e5bbd9d4", diff --git a/.aspect/workflows/terraform/main.tf b/.aspect/workflows/terraform/main.tf index 74b4163..e6ec979 100644 --- a/.aspect/workflows/terraform/main.tf +++ b/.aspect/workflows/terraform/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.4.0" + required_version = ">= 1.4.0" backend "gcs" { bucket = "aw-deployment-terraform-state-rules-jasmine" diff --git a/.aspect/workflows/terraform/workflows.tf b/.aspect/workflows/terraform/workflows.tf index c8d5d35..ac18247 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.9/workflows-gcp/terraform-gcp-aspect-workflows.zip" + source = "https://s3.us-east-2.amazonaws.com/static.aspect.build/aspect/5.9.0-rc.15/workflows-gcp/terraform-gcp-aspect-workflows.zip" # Network properties network = google_compute_network.workflows_network.id diff --git a/.github/workflows/.aspect-workflows-reusable.yaml b/.github/workflows/.aspect-workflows-reusable.yaml index 51dad4a..5444d48 100644 --- a/.github/workflows/.aspect-workflows-reusable.yaml +++ b/.github/workflows/.aspect-workflows-reusable.yaml @@ -1,7 +1,7 @@ # ================================================================================================== -# Aspect Workflows Reusable Workflow for GitHub Actions (v5.9.0-rc.9) +# Aspect Workflows Reusable Workflow for GitHub Actions (v5.9.0-rc.15) # -# https://github.com/marketplace/actions/aspect-workflows?version=5.9.0-rc.9 +# https://github.com/marketplace/actions/aspect-workflows?version=5.9.0-rc.15 # # At this time, GitHub Actions does not allow referencing reusable workflows from public # repositories in other organizations. See @@ -37,10 +37,10 @@ # jobs: # aspect-workflows: # name: Aspect Workflows -# uses: my-github-org/workflows-action/.github/workflows/.aspect-workflows-reusable.yaml@5.9.0-rc.9 +# uses: my-github-org/workflows-action/.github/workflows/.aspect-workflows-reusable.yaml@5.9.0-rc.15 # ``` # ================================================================================================== -name: Aspect Workflows Reusable Workflow (v5.9.0-rc.9) +name: Aspect Workflows Reusable Workflow (v5.9.0-rc.15) on: # Makes this workflow reusable, see @@ -115,7 +115,7 @@ jobs: run: rm -rf ${{ join(fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].artifact_paths, ' ') }} - name: Determine changed files - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 if: endsWith(matrix.job, 'format') with: json: true @@ -123,14 +123,14 @@ jobs: output_dir: ${{ fromJson(needs.setup.outputs.cfg).platform.directories.ARTIFACTS_DIR }} - name: Branch Freshness - uses: aspect-build/workflows-action@5.9.0-rc.9 + uses: aspect-build/workflows-action@5.9.0-rc.15 timeout-minutes: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].branch_freshness_timeout }} with: workspace: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].workspace }} task: branch_freshness - name: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].name }} - uses: aspect-build/workflows-action@5.9.0-rc.9 + uses: aspect-build/workflows-action@5.9.0-rc.15 env: ${{ inputs.inherited_secrets != '' && fromJson(steps.process_secrets.outputs.filtered_secrets) || fromJson('{}') }} timeout-minutes: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].timeout_in_minutes }} with: @@ -152,7 +152,7 @@ jobs: - name: Delivery Manifest if: fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].generate_manifest - uses: aspect-build/workflows-action@5.9.0-rc.9 + uses: aspect-build/workflows-action@5.9.0-rc.15 timeout-minutes: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].delivery_manifest_timout }} with: workspace: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].workspace }} diff --git a/.github/workflows/aspect-workflows-delivery.yaml b/.github/workflows/aspect-workflows-delivery.yaml index 17cc87a..e8491aa 100644 --- a/.github/workflows/aspect-workflows-delivery.yaml +++ b/.github/workflows/aspect-workflows-delivery.yaml @@ -6,11 +6,11 @@ on: workflow_dispatch: inputs: delivery_commit: - description: commit to run + description: The commit to checkout and run the delivery from. Targets listed in the delivery manifest for this commit will be delivered unless specific targets are listed in `delivery_targets`. type: string required: true delivery_targets: - description: targets to run, delimited by comma and/or space + description: List of Bazel targets to deliver, delimited by spaces. For example, \`//app/a:push_release //app/b:push_release\`. If empty, targets listed in the delivery manifest for the target commit will be delivered. type: string required: false @@ -33,7 +33,7 @@ jobs: - name: Agent health checks run: ${ASPECT_WORKFLOWS_BIN_DIR}/agent_health_check - name: Run Delivery - uses: aspect-build/workflows-action@5.9.0-rc.9 + uses: aspect-build/workflows-action@5.9.0-rc.15 with: task: delivery env: diff --git a/.github/workflows/aspect-workflows-warming.yaml b/.github/workflows/aspect-workflows-warming.yaml index d360a4c..5295d65 100644 --- a/.github/workflows/aspect-workflows-warming.yaml +++ b/.github/workflows/aspect-workflows-warming.yaml @@ -22,7 +22,7 @@ jobs: - name: Agent health checks run: ${ASPECT_WORKFLOWS_BIN_DIR}/agent_health_check - name: Create warming archive - uses: aspect-build/workflows-action@5.9.0-rc.9 + uses: aspect-build/workflows-action@5.9.0-rc.15 with: task: warming - name: Archive warming tars diff --git a/.github/workflows/deps.bzl b/.github/workflows/deps.bzl index bdc2b74..dbdb119 100644 --- a/.github/workflows/deps.bzl +++ b/.github/workflows/deps.bzl @@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ASPECT_WORKFLOWS_VERSION = "5.9.0-rc.9" -ASPECT_WORKFLOWS_ACTION_SHA256 = "02e1c14b272c122cbe0b9445163b705bc6ffc1f8a6043fe80521fbc400c46cf9" +ASPECT_WORKFLOWS_VERSION = "5.9.0-rc.15" +ASPECT_WORKFLOWS_ACTION_SHA256 = "9c2b3801a2cdb05e92922b59f8fa7d3e6a292c09672cbe329aba759bf2d44193" def aspect_workflows_github_actions_deps(): "Fetch deps needed for Aspect Workflows on GitHub Actions"