Skip to content

Commit 1fb8ccd

Browse files
sdarwinsdarwin
committed
Continuing upgrade testing
1 parent 7a55485 commit 1fb8ccd

18 files changed

+93
-76
lines changed

‎examples/lambdas-download-cppal/.terraform.lock.hcl

Lines changed: 30 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/lambdas-download-cppal/README-CPP.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
#!/bin/bash
2+
3+
set -xe
14

25
terraform init -upgrade
36
terraform init
47
# terraform apply -var=module_version=v3.3.0
5-
terraform apply -var=module_version=v3.4.2
8+
# terraform apply -var=module_version=v3.4.2
9+
terraform apply -var=module_version=v6.7.3

‎examples/lambdas-download-cppal/install.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
set -xe
4+
5+
terraform init -upgrade
6+
terraform init
7+
# terraform apply -var=module_version=v3.3.0
8+
# terraform apply -var=module_version=v3.4.2
9+
terraform apply -var=module_version=v6.7.3

‎examples/multi-runner-cppal/main.tf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ module "base" {
7777
aws_region = local.aws_region
7878
}
7979

80-
# module "runners" {
81-
module "multi-runner" {
80+
module "runners" {
81+
# module "multi-runner" {
8282
source = "../../modules/multi-runner"
8383
multi_runner_config = local.multi_runner_config
8484
# Alternative to loading runner configuration from Yaml files is using static configuration:
@@ -157,14 +157,14 @@ module "multi-runner" {
157157
# }
158158
}
159159

160-
# module "webhook_github_app" {
161-
# source = "../../modules/webhook-github-app"
162-
# depends_on = [module.runners]
163-
#
164-
# github_app = {
165-
# key_base64 = var.github_app.key_base64
166-
# id = var.github_app.id
167-
# webhook_secret = random_id.random.hex
168-
# }
169-
# webhook_endpoint = module.runners.webhook.endpoint
170-
# }
160+
module "webhook_github_app" {
161+
source = "../../modules/webhook-github-app"
162+
depends_on = [module.runners]
163+
164+
github_app = {
165+
key_base64 = var.github_app.key_base64
166+
id = var.github_app.id
167+
webhook_secret = random_id.random.hex
168+
}
169+
webhook_endpoint = module.runners.webhook.endpoint
170+
}

‎examples/multi-runner-cppal/outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
output "webhook_endpoint" {
2-
# value = module.runners.webhook.endpoint
3-
value = module.multi-runner.webhook.endpoint
2+
value = module.runners.webhook.endpoint
3+
# value = module.multi-runner.webhook.endpoint
44
}
55

66
output "webhook_secret" {
@@ -10,6 +10,6 @@ output "webhook_secret" {
1010

1111
output "deprecated_variables_warning" {
1212
value = join("", [
13-
module.multi-runner.deprecated_variables_warning,
13+
module.runners.deprecated_variables_warning,
1414
])
1515
}

‎examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ runner_config:
2828
scale_down_schedule_expression: cron(* * * * ? *)
2929
# userdata_template: ./templates/user-data.sh
3030
ami:
31-
owners: [ "047402373783" ]
32-
filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202410151633'] }
31+
owners: [ "254949769574" ]
32+
filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202308022332'] }
3333
block_device_mappings:
3434
- device_name: /dev/sda1
3535
delete_on_termination: true

‎examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ runner_config:
2828
scale_down_schedule_expression: cron(* * * * ? *)
2929
# userdata_template: ./templates/user-data.sh
3030
ami:
31-
owners: [ "047402373783" ]
32-
filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202411261305'] }
31+
owners: [ "254949769574" ]
32+
filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202308022332'] }
3333
block_device_mappings:
3434
- device_name: /dev/sda1
3535
delete_on_termination: true

‎examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runner_config:
2828
scale_down_schedule_expression: cron(* * * * ? *)
2929
# userdata_template: ./templates/user-data.sh
3030
ami:
31-
owners: [ "047402373783" ]
31+
owners: [ "254949769574" ]
3232
filter: { 'name': ['github-runner-ubuntu-focal-arm64-202508111835'] }
3333
block_device_mappings:
3434
- device_name: /dev/sda1

‎examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runner_config:
2828
scale_down_schedule_expression: cron(* * * * ? *)
2929
# userdata_template: ./templates/user-data.sh
3030
ami:
31-
owners: [ "047402373783" ]
31+
owners: [ "254949769574" ]
3232
filter: { 'name': ['github-runner-ubuntu-focal-amd64-202508112019'] }
3333
block_device_mappings:
3434
- device_name: /dev/sda1

‎examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ runner_config:
2929
scale_down_schedule_expression: cron(* * * * ? *)
3030
# userdata_template: ./templates/user-data.sh
3131
ami:
32-
owners: [ "047402373783" ]
32+
owners: [ "254949769574" ]
3333
filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202508112038'] }
3434
block_device_mappings:
3535
- device_name: /dev/sda1

0 commit comments

Comments
 (0)