diff --git a/action.sh b/action.sh index a114b96..31b5f66 100755 --- a/action.sh +++ b/action.sh @@ -21,6 +21,7 @@ token= project_id= service_account_key= runner_ver= +vm_name_prefix= machine_zone= machine_type= boot_disk_type= @@ -49,6 +50,7 @@ while getopts_long :h opt \ project_id required_argument \ service_account_key required_argument \ runner_ver required_argument \ + vm_name_prefix required_argument \ machine_zone required_argument \ machine_type required_argument \ boot_disk_type optional_argument \ @@ -87,6 +89,9 @@ do runner_ver) runner_ver=$OPTLARG ;; + vm_name_prefix) + vm_name_prefix=$OPTLARG + ;; machine_zone) machine_zone=$OPTLARG ;; @@ -180,7 +185,7 @@ function start_vm { jq -r .token) echo "✅ Successfully got the GitHub Runner registration token" - VM_ID="gce-gh-runner-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" + VM_ID="${vm_name_prefix}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" service_account_flag=$([[ -z "${runner_service_account}" ]] || echo "--service-account=${runner_service_account}") image_project_flag=$([[ -z "${image_project}" ]] || echo "--image-project=${image_project}") image_flag=$([[ -z "${image}" ]] || echo "--image=${image}") diff --git a/action.yml b/action.yml index b43ca15..83e7811 100644 --- a/action.yml +++ b/action.yml @@ -24,6 +24,10 @@ inputs: description: Version of the GitHub Runner. "latest" will resolve the latest version. default: "latest" required: true + vm_name_prefix: + description: Prefix of the name of created VM, final name is ${prefix}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT} + default: "gce-gh-runner" + required: true machine_zone: description: GCE zone default: "us-east1-c" @@ -120,6 +124,7 @@ runs: --project_id=${{ inputs.project_id }} --service_account_key='${{ inputs.service_account_key }}' --runner_ver=${{ inputs.runner_ver }} + --vm_name_prefix=${{ inputs.vm_name_prefix }} --machine_zone=${{ inputs.machine_zone }} --machine_type=${{ inputs.machine_type }} --network=${{ inputs.network }}