Skip to content

dsc makefile output updates for arm64 support #75

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

Merged
vab merged 1 commit into from
Feb 6, 2026
Merged

dsc makefile output updates for arm64 support #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: "v1.103.0"
rev: "v1.105.0"
hooks:
- id: terraform_fmt
args:
- --args=-recursive
- id: terraform_validate
- repo: https://github.com/terraform-docs/terraform-docs
rev: "v0.20.0"
rev: "v0.21.0"
hooks:
- id: terraform-docs-go
args: ["markdown", "table", "--config", "./.terraform-docs.yaml", "--recursive", "--output-file", "README.md", "./"]
- repo: https://github.com/bridgecrewio/checkov.git
rev: '3.2.490'
rev: '3.2.500'
hooks:
- id: checkov
verbose: false
1 change: 1 addition & 0 deletions .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.

4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ This is a core infrastructure repository that defines infrastructure related to

* Owner: See [CODEOWNERS](./.github/CODEOWNERS)
* Team: See [CODEOWNERS](./.github/CODEOWNERS)
* Last Maintenance: 2025-11
* Last Maintenance: 2026-02

## TF markdown is automatically inserted at the bottom of this file, nothing should be written beyond this point

Expand All @@ -149,7 +149,7 @@ This is a core infrastructure repository that defines infrastructure related to

| Name | Version |
|------|---------|
| terraform | ~> 1.13 |
| terraform | ~> 1.14 |
| aws | ~> 5.0 |

## Providers
Expand Down
8 changes: 4 additions & 4 deletions dsc_ecr.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module "ecr_dsc" {
## For dsc application repo and ECR repository
# Outputs in dev
output "dsc_fargate_dev_build_workflow" {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build-cpu-arch.tpl", {
region = var.aws_region
role = module.ecr_dsc.gha_role
ecr = module.ecr_dsc.repository_name
Expand All @@ -31,7 +31,7 @@ output "dsc_fargate_dev_build_workflow" {
description = "Full contents of the dev-build.yml for the dsc repo"
}
output "dsc_fargate_makefile" {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile-cpu-arch.tpl", {
ecr_name = module.ecr_dsc.repository_name
ecr_url = module.ecr_dsc.repository_url
function = ""
Expand All @@ -42,7 +42,7 @@ output "dsc_fargate_makefile" {

# Outputs in stage
output "dsc_fargate_stage_build_workflow" {
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build-cpu-arch.tpl", {
region = var.aws_region
role = module.ecr_dsc.gha_role
ecr = module.ecr_dsc.repository_name
Expand All @@ -54,7 +54,7 @@ output "dsc_fargate_stage_build_workflow" {

# Outputs after promotion to prod
output "dsc_fargate_prod_promote_workflow" {
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote-cpu-arch.tpl", {
region = var.aws_region
role_stage = "${module.ecr_dsc.repo_name}-gha-stage"
role_prod = "${module.ecr_dsc.repo_name}-gha-prod"
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Providers themselves are set in the `providers.tf` file.

terraform {
required_version = "~> 1.13"
required_version = "~> 1.14"

required_providers {
aws = {
Expand Down