Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor tidy ups #5

Merged
merged 2 commits into from
May 14, 2024
Merged

Minor tidy ups #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
238a8e3
Lock Terraform providers for all expected platforms (linux_amd64, dar…
tsibley May 14, 2024
47c5c8d
Allow nextstrain/zika to assume GitHubActionsRoleNextstrainBatchJobs
tsibley May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
SHELL := bash -euo pipefail

lockfiles := $(shell git ls-files '**/.terraform.lock.hcl')

## Re-generate Terraform provider lock files for all expected platforms.
lockfiles: $(lockfiles)
$(lockfiles): %/.terraform.lock.hcl: PHONY
terraform -chdir=$* providers lock -platform={linux_amd64,darwin_{amd64,arm64}}

## Print this help message.
help:
@perl -ne 'print if /^## / ... s/^(?<!##)(.+?):.*/make \1\n/ and not /^#( |$$)/' Makefile

.PHONY: PHONY help
PHONY:
2 changes: 2 additions & 0 deletions env/production/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion env/production/aws-iam-role-GitHubActionsRoleNextstrainBatchJobs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ resource "aws_iam_role" "GitHubActionsRoleNextstrainBatchJobs" {
"Condition": {
"StringLike": {
"token.actions.githubusercontent.com:aud": "sts.amazonaws.com",
"token.actions.githubusercontent.com:sub": "repo:nextstrain/.github:*"
"token.actions.githubusercontent.com:sub": [
"repo:nextstrain/.github:*",
"repo:nextstrain/zika:*",
]
}
},
}
Expand Down