@@ -114,12 +114,12 @@ jobs:
114
114
run : |
115
115
case "$ACTIONS_RUNNER_SCOPE" in
116
116
"org-level")
117
- ACTIONS_API_URL="https://api.github.com/repos/${{ env. ACTIONS_RUNNER_ORG }} /actions/runners/registration-token"
118
- echo ACTIONS_RUNNER_REGISTRATION_URL="https://github.com/${{ env. ACTIONS_RUNNER_ORG }} " >> $GITHUB_ENV
117
+ ACTIONS_API_URL="https://api.github.com/repos/$ACTIONS_RUNNER_ORG/actions/runners/registration-token"
118
+ echo ACTIONS_RUNNER_REGISTRATION_URL="https://github.com/$ACTIONS_RUNNER_ORG" >> $GITHUB_ENV
119
119
;;
120
120
"repo-level")
121
- ACTIONS_API_URL="https://api.github.com/repos/${{ env. ACTIONS_RUNNER_ORG }}/${{ env. ACTIONS_RUNNER_REPO }} /actions/runners/registration-token"
122
- echo ACTIONS_RUNNER_REGISTRATION_URL="https://github.com/${{ env. ACTIONS_RUNNER_ORG }}/${{ env. ACTIONS_RUNNER_REPO }} " >> $GITHUB_ENV
121
+ ACTIONS_API_URL="https://api.github.com/repos/$ACTIONS_RUNNER_ORG/$ ACTIONS_RUNNER_REPO/actions/runners/registration-token"
122
+ echo ACTIONS_RUNNER_REGISTRATION_URL="https://github.com/$ACTIONS_RUNNER_ORG/$ ACTIONS_RUNNER_REPO" >> $GITHUB_ENV
123
123
;;
124
124
*)
125
125
echo "Unsupported runner scope: $ACTIONS_RUNNER_SCOPE"
@@ -135,16 +135,32 @@ jobs:
135
135
$ACTIONS_API_URL \
136
136
| jq --raw-output .token)
137
137
echo "::add-mask::$ACTIONS_RUNNER_TOKEN"
138
- echo ACTIONS_RUNNER_TOKEN=$ACTIONS_RUNNER_TOKEN >> $GITHUB_ENV
139
138
140
139
# The Azure VM type we use has blazing-fast local, temporary storage available as the D:\ drive.
141
140
# The only downside is that, after dellocation, the contents of this disk (including the Actions Runner),
142
141
# are destroyed. Let's only use it when we don't immediately deallocate the VM.
143
- if [[ "${{ env. DEALLOCATE_IMMEDIATELY }} " == "true" ]]; then
144
- echo " ACTIONS_RUNNER_PATH=C:\a" >> $GITHUB_ENV
142
+ if [[ "$DEALLOCATE_IMMEDIATELY" == "true" ]]; then
143
+ ACTIONS_RUNNER_PATH=" C:\a"
145
144
else
146
- echo " ACTIONS_RUNNER_PATH=D:\a" >> $GITHUB_ENV
145
+ ACTIONS_RUNNER_PATH=" D:\a"
147
146
fi
147
+
148
+ AZURE_ARM_PARAMETERS=$(cat <<-END
149
+ githubActionsRunnerRegistrationUrl="$ACTIONS_RUNNER_REGISTRATION_URL"
150
+ githubActionsRunnerToken="$ACTIONS_RUNNER_TOKEN"
151
+ postDeploymentPsScriptUrl="$POST_DEPLOYMENT_SCRIPT_URL"
152
+ virtualMachineName="${{ steps.generate-vm-name.outputs.vm_name }}"
153
+ virtualMachineSize="$AZURE_VM_TYPE"
154
+ publicIpAddressName1="${{ steps.generate-vm-name.outputs.vm_name }}-ip"
155
+ adminUsername="${{ secrets.AZURE_VM_USERNAME }}"
156
+ adminPassword="${{ secrets.AZURE_VM_PASSWORD }}"
157
+ stopService="$DEALLOCATE_IMMEDIATELY"
158
+ githubActionsRunnerPath="$ACTIONS_RUNNER_PATH"
159
+ location="$AZURE_VM_REGION"
160
+ END
161
+ )
162
+
163
+ echo "AZURE_ARM_PARAMETERS=$AZURE_ARM_PARAMETERS" >> $GITHUB_ENV
148
164
149
165
- name : Azure Login
150
166
uses : azure/login@v1
@@ -155,7 +171,7 @@ jobs:
155
171
with :
156
172
resourceGroupName : ${{ secrets.AZURE_RESOURCE_GROUP }}
157
173
template : ./azure-self-hosted-runners/azure-arm-template.json
158
- parameters : ./azure-self-hosted-runners/azure-arm-template-example-parameters.json githubActionsRunnerRegistrationUrl=" ${{ env.ACTIONS_RUNNER_REGISTRATION_URL }}" githubActionsRunnerToken="${{ env.ACTIONS_RUNNER_TOKEN }}" postDeploymentPsScriptUrl="${{ env.POST_DEPLOYMENT_SCRIPT_URL }}" virtualMachineName=${{ steps.generate-vm-name.outputs.vm_name }} virtualMachineSize="${{ env.AZURE_VM_TYPE }}" publicIpAddressName1=${{ steps.generate-vm-name.outputs.vm_name }}-ip adminUsername=${{ secrets.AZURE_VM_USERNAME }} adminPassword=${{ secrets.AZURE_VM_PASSWORD }} stopService=${{ env.DEALLOCATE_IMMEDIATELY }} githubActionsRunnerPath="${{ env.ACTIONS_RUNNER_PATH }}" location="${{ env.AZURE_VM_REGION }}"
174
+ parameters : ./azure-self-hosted-runners/azure-arm-template-example-parameters.json ${{ env.AZURE_ARM_PARAMETERS }}
159
175
160
176
- name : Deallocate the VM for later use
161
177
if : env.DEALLOCATE_IMMEDIATELY == 'true'
0 commit comments