Skip to content

Commit

Permalink
upgrade@12818479642
Browse files Browse the repository at this point in the history
  • Loading branch information
galargh committed Jan 16, 2025
1 parent e5c588c commit d7ee7b7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ concurrency:

jobs:
prepare:
# not starting for PRs if repo is private because we cannot write to private forks
# WARN: writing to private forks is not supported
if: github.event_name == 'workflow_dispatch' ||
(github.event_name == 'pull_request_target' &&
github.event.pull_request.head.repo.private == false) ||
github.event_name == 'pull_request_target' ||
(github.event_name == 'workflow_run' &&
github.event.workflow_run.conclusion == 'success')
permissions:
Expand Down Expand Up @@ -109,7 +108,7 @@ jobs:
run: node lib/actions/fix-yaml-config.js
working-directory: scripts
- name: Upload YAML config
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.TF_WORKSPACE }}.yml
path: github/${{ env.TF_WORKSPACE }}.yml
Expand Down Expand Up @@ -153,7 +152,7 @@ jobs:
with:
path: base
- name: Download YAML configs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Copy YAML configs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/plan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
terraform plan -refresh=false -lock=false -out="${TF_WORKSPACE}.tfplan" -no-color
working-directory: terraform
- name: Upload terraform plan
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.TF_WORKSPACE }}_${{ github.event.pull_request.head.sha || github.sha }}.tfplan
path: terraform/${{ env.TF_WORKSPACE }}.tfplan
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
run: terraform init
working-directory: terraform
- name: Download terraform plans
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: terraform
- name: Show terraform plans
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- workflows: not to use deprecated GitHub Actions expressions anymore
- tf: to prevent destroy of membership and repository resources
- apply: find sha for plan using proper credentials
- updated upload and download artifacts actions to v4

### Fixed
- links to supported resources in HOWTOs
Expand Down
2 changes: 1 addition & 1 deletion terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ locals {
} : {
source = "config"
index = repository
archived = config.archived
archived = try(config.archived, false)
}
] : item.index => merge(local.sources[item.source].github_repository.this[item.index], { archived = item.archived })
}
Expand Down

0 comments on commit d7ee7b7

Please sign in to comment.