Skip to content

Commit

Permalink
Merge branch 'main' into execute-orchestrate-custom-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
odgrim authored Mar 6, 2025
2 parents f9b708f + a76beae commit d0cb81b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pipelines-drift-detection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ on:
PR_CREATE_TOKEN:
required: false
env:
PIPELINES_CLI_VERSION: v0.35.5
PIPELINES_ACTIONS_VERSION: v3.4.1
PIPELINES_CLI_VERSION: v0.36.2
PIPELINES_ACTIONS_VERSION: v3.4.3
BOILERPLATE_VERSION: v0.5.16
GRUNTWORK_INSTALLER_VERSION: v0.0.40

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/pipelines-root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ on:
required: false

env:
PIPELINES_CLI_VERSION: v0.35.5
PIPELINES_ACTIONS_VERSION: v3.4.1 # TODO: update to whatever version comes after we merge matching actions PR

PIPELINES_CLI_VERSION: v0.36.2
PIPELINES_ACTIONS_VERSION: v3.4.3 # TODO: update to whatever version comes after we merge matching actions PR
BOILERPLATE_VERSION: v0.5.16
GRUNTWORK_INSTALLER_VERSION: v0.0.40

Expand Down Expand Up @@ -92,6 +93,7 @@ jobs:
- name: Fetch Org Repo Admin Token
id: pipelines-org-repo-admin-token
uses: gruntwork-io/pipelines-credentials@v1
continue-on-error: true
with:
PIPELINES_TOKEN_PATH: org-repo-admin/${{ github.repository_owner }}
FALLBACK_TOKEN: ${{ secrets.ORG_REPO_ADMIN_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pipelines-unlock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ on:
PIPELINES_READ_TOKEN:
required: true
env:
PIPELINES_CLI_VERSION: v0.35.5
PIPELINES_ACTIONS_VERSION: v3.4.1
PIPELINES_CLI_VERSION: v0.36.2
PIPELINES_ACTIONS_VERSION: v3.4.3

jobs:
unlock_one:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ on:
required: false

env:
PIPELINES_CLI_VERSION: v0.35.5
PIPELINES_ACTIONS_VERSION: v3.4.1 # TODO: update to whatever version comes after we merge matching actions PR
PIPELINES_CLI_VERSION: v0.36.2
PIPELINES_ACTIONS_VERSION: v3.4.3# TODO: update to whatever version comes after we merge matching actions PR

# GitHub Actions tends to hit resource exhaustion and kill running jobs
# if we leave parallelism unbounded, so we set the max to 10 for a sane default.
Expand Down

0 comments on commit d0cb81b

Please sign in to comment.