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.

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

chore: update deps #4

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN SYSTEM_ARCH=$(uname -m) \
&& rm -rf aws

# install terraform
ENV TERRAFORM_VERSION=1.5.1
ENV TERRAFORM_VERSION=1.8.5
ENV TF_PLUGIN_CACHE_DIR=$HOME/.terraform.d/plugin-cache
RUN mkdir -p $TF_PLUGIN_CACHE_DIR
RUN SYSTEM_ARCH=$(dpkg --print-architecture) \
Expand Down
14 changes: 7 additions & 7 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Terraform",
"dockerFile": "Dockerfile",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2.0.1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2.11.0": {}
},
"mounts": [
"source=${localEnv:HOME}/.aws,target=/home/vscode/.aws,type=bind,consistency=cached"
Expand All @@ -14,7 +14,7 @@
"vscode": {
"settings": {
"editor.codeActionsOnSave": {
"source.fixAll": true
"source.fixAll": "always"
},
"editor.formatOnSave": true,
"editor.formatOnType": false,
Expand All @@ -29,7 +29,7 @@
},
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
}
},
"extensions": [
"darkriszty.markdown-table-prettify",
Expand All @@ -42,8 +42,8 @@
"ms-azuretools.vscode-docker",
"ms-python.black-formatter",
"timonwong.shellcheck",
"VisualStudioExptTeam.vscodeintellicode",
],
"VisualStudioExptTeam.vscodeintellicode"
]
}
},
}
}
}
1 change: 0 additions & 1 deletion examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module "github_runner" {
github_organization = var.github_organization
runner_maximum_count = 10
runner_labels = var.runner_labels
runner_version = "3.6.1"
instance_types = var.instance_types
log_retention = 7
vpc_id = var.vpc_id
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
enabled = coalesce(var.enabled, module.this.enabled, true)
name = coalesce(var.name, module.this.name, "github-runner-${random_string.github_runner_random_suffix.result}")

runner_module_version = "v5.6.0"
runner_module_version = "v5.11.0"

aws_account_id = module.this.enabled && var.aws_account_id != "" ? var.aws_account_id : try(data.aws_caller_identity.current[0].account_id, "")
aws_region_name = module.this.enabled && var.aws_region_name != "" ? var.aws_region_name : try(data.aws_region.current[0].name, "")
Expand Down Expand Up @@ -40,7 +40,7 @@ resource "random_string" "github_runner_random_suffix" {

module "github_runner" {
source = "philips-labs/github-runner/aws"
version = "v5.6.0" # should match local.runner_module_version
version = "v5.11.0" # should match local.runner_module_version

prefix = module.github_runner_label.id
enable_ephemeral_runners = var.runner_ephemeral_mode_enabled
Expand Down Expand Up @@ -129,7 +129,7 @@ resource "random_password" "webhook" {

module "runner_binaries" {
source = "cruxstack/artifact-packager/docker"
version = "1.3.2"
version = "1.3.6"

artifact_src_type = "directory"
artifact_dst_directory = coalesce(var.runner_binaries_path, "${path.module}/dist")
Expand Down
1 change: 1 addition & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ variable "instance_types" {
variable "instance_lifecycle_type" {
type = string
description = "Lifecycle type for action runner instances. Options: `spot` or `on-demand`."
default = "spot"

validation {
condition = contains(["spot", "on-demand"], lower(var.instance_lifecycle_type))
Expand Down
Loading