Skip to content

Commit

Permalink
chore: switch Aspect Worklows GitHub Actions to run on main branch on…
Browse files Browse the repository at this point in the history
… bazel-examples-gha fokr
  • Loading branch information
gregmagolan committed Dec 30, 2024
1 parent 27a0259 commit ebe941f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/aspect-workflows-warming.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
- name: Workflows environment
run: ${ASPECT_WORKFLOWS_BIN_DIR}/configure_workflows_env
- uses: actions/checkout@v4
with:
ref: main-gha
- name: Agent health check
# Set RUNNER_TRACKER_ID="" to prevent GitHub Actions from killing the Bazel server started
# during health check when "Cleaning up orphan processes" in the "Complete job" step.
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/aspect-workflows.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Aspect Workflows

on:
# Triggers the workflow on the main-gha branch and on pull requests with main-gha bases
# Triggers the workflow on main and on pull request to main
push:
branches: [main-gha]
branches: [main]
pull_request:
branches: [main-gha]
branches: [main]

# Run the workflows on a cron schedule to run once a day on main branch
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
Expand All @@ -16,10 +16,10 @@ on:
workflow_dispatch:

concurrency:
# Cancel previous actions from the same PR or branch except 'main-gha' branch.
# Cancel previous actions from the same PR or branch except 'main' branch.
# See https://docs.github.com/en/actions/using-jobs/using-concurrency and https://docs.github.com/en/actions/learn-github-actions/contexts for more info.
group: concurrency-group::${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}${{ github.ref_name == 'main-gha' && format('::{0}', github.run_id) || ''}}
cancel-in-progress: ${{ github.ref_name != 'main-gha' }}
group: concurrency-group::${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}${{ github.ref_name == 'main' && format('::{0}', github.run_id) || ''}}
cancel-in-progress: ${{ github.ref_name != 'main' }}

jobs:
aspect-workflows:
Expand Down

0 comments on commit ebe941f

Please sign in to comment.