Skip to content

Commit

Permalink
Merge branch 'main' into trunk-io/update-trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
chris3ware authored Feb 25, 2025
2 parents e5b100e + 970f2d6 commit ec3cc3f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 3 deletions.
1 change: 0 additions & 1 deletion .github/workflows/delete-workflow-run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Delete old workflow runs
on:
schedule:
- cron: 0 0 1 * *
workflow_call: {}

# Disable permissions for all available scopes
permissions: {}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/terraform-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
needs: [get-temp-token]
env:
TF_DOCS_FILE: README.md
# TODO: Define as an input, because calling workflow could use a different event type
BRANCH: ${{ github.base_ref }}
steps:
- name: Decrypt the installation access token
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/trunk-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Trunk Upgrade
on:
schedule:
- cron: 0 1 * * 2
workflow_call: {}
workflow_dispatch: {}

permissions: {}
Expand Down Expand Up @@ -41,4 +42,4 @@ jobs:
uses: trunk-io/trunk-action/upgrade@8e4c812061ece3fa253bbfa5a80ee1caefa19eb1 # v1.22.9
with:
github-token: ${{ steps.decrypt-token.outputs.temp-token }}
prefix: "ci(trunk):"
prefix: "ci(trunk): "
4 changes: 4 additions & 0 deletions .github/workflows/wait-for-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
types: [opened, edited, reopened, synchronize]
branches: [main]
workflow_call: {}

# Disable permissions for all available scopes
permissions: {}
Expand All @@ -26,6 +27,9 @@ jobs:
# check run "auto-approve-pr" is completed with conclusion "cancelled" (unsuccessful) when skipped
# auto-approve-pr should run on the conclusion of enforce-all-checks, so checks should not check for auto-approve-pr
ignore: auto-approve-pr
# ignore any pattern before '/ enforce-all-checks' for calling workflows
# For example if the calling workflow job name is 'Checks' the path to ignore is 'Checks / enforce-all-checks'
ignore_pattern: .*\/ enforce-all-checks

# Approve PR raised by 3ware-release[bot] to upgrade trunk on trunk branches
# after all checks have passed.
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

All notable changes to this project will be documented in this file.

## [4.10.0](https://github.com/3ware/workflows/compare/v4.9.0...v4.10.0) (2025-02-25)


### Features

* **trunk:** Add `workflow_call` trigger ([#155](https://github.com/3ware/workflows/issues/155)) ([6865d40](https://github.com/3ware/workflows/commit/6865d404241f5951c693f390ea7b08943a6bb758))

## [4.9.0](https://github.com/3ware/workflows/compare/v4.8.0...v4.9.0) (2025-02-25)


### Features

* **checks:** Add workflow_call event to wait-for-checks workflow ([#156](https://github.com/3ware/workflows/issues/156)) ([cc574b5](https://github.com/3ware/workflows/commit/cc574b5ef75c8527b3b505e708164275f0e8e2f5))

## [4.8.0](https://github.com/3ware/workflows/compare/v4.7.6...v4.8.0) (2025-02-24)


Expand Down

0 comments on commit ec3cc3f

Please sign in to comment.