Skip to content

Commit

Permalink
Sync internal change to GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed Mar 7, 2024
1 parent 71064d9 commit c00d30a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/.aspect-workflows-reusable.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ==================================================================================================
# Aspect Workflows Reusable Workflow for GitHub Actions (v5.9.18)
# Aspect Workflows Reusable Workflow for GitHub Actions (v5.9.20)
#
# https://github.com/marketplace/actions/aspect-workflows?version=5.9.18
# https://github.com/marketplace/actions/aspect-workflows?version=5.9.20
#
# At this time, GitHub Actions does not allow referencing reusable workflows from public
# repositories in other organizations. See
Expand Down Expand Up @@ -37,10 +37,10 @@
# jobs:
# aspect-workflows:
# name: Aspect Workflows
# uses: my-github-org/workflows-action/.github/workflows/[email protected].18
# uses: my-github-org/workflows-action/.github/workflows/[email protected].20
# ```
# ==================================================================================================
name: Aspect Workflows Reusable Workflow (v5.9.18)
name: Aspect Workflows Reusable Workflow (v5.9.20)

on:
# Makes this workflow reusable, see
Expand Down Expand Up @@ -124,14 +124,14 @@ jobs:
output_dir: ${{ fromJson(needs.setup.outputs.cfg).platform.directories.ARTIFACTS_DIR }}

- name: Branch Freshness
uses: aspect-build/[email protected].18
uses: aspect-build/[email protected].20
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/[email protected].18
uses: aspect-build/[email protected].20
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:
Expand All @@ -153,7 +153,7 @@ jobs:

- name: Delivery Manifest
if: fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].generate_manifest
uses: aspect-build/[email protected].18
uses: aspect-build/[email protected].20
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 }}
Expand All @@ -166,10 +166,11 @@ jobs:
# Setting `continue-on-error: true` on previous steps isn't ideal as the UI
# will flag them as having passed even if they failed.
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].artifact_prefix }}${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].task }}.artifacts
path: ${{ fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].artifact_upload_pattern }}
overwrite: true

# Codecov
- name: Codecov Upload
Expand All @@ -178,7 +179,7 @@ jobs:
# will flag them as having passed even if they failed.
if: ${{ always() && fromJson(needs.setup.outputs.cfg).workflows_config[matrix.job].codecov_upload }}
# https://github.com/marketplace/actions/codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: bazel-out/_coverage/_coverage_report.dat
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ If you forked the repo to your org, then replace `my-org` with your org in this
jobs:
aspect-workflows:
name: Aspect Workflows
uses: my-org/workflows-action/.github/workflows/[email protected].18
uses: my-org/workflows-action/.github/workflows/[email protected].20
```
If you vendored the file, then instead it will be:
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: Agent health checks
run: /etc/aspect/workflows/bin/agent_health_check
- name: Run Delivery
uses: aspect-build/[email protected].18
uses: aspect-build/[email protected].20
with:
task: delivery
env:
Expand Down

0 comments on commit c00d30a

Please sign in to comment.