Cleanup

Author: aledbf

action.sh

@@ -172,8 +172,9 @@ EOF
 
 chmod +x /etc/systemd/system/shutdown.sh
 
-su -s /bin/bash -c "cd /actions-runner-1/;/actions-runner-1/config.sh --url https://github.com/${GITHUB_REPOSITORY} --token ${RUNNER_TOKEN} --name ${VM_ID}-1 --labels ${VM_ID} --unattended --disableupdate" runner
-su -s /bin/bash -c "cd /actions-runner-2/;/actions-runner-2/config.sh --url https://github.com/${GITHUB_REPOSITORY} --token ${RUNNER_TOKEN} --name ${VM_ID}-2 --labels ${VM_ID} --unattended --disableupdate" runner
+RUNNER_ID=${VM_ID}-$(date +%s)
+su -s /bin/bash -c "cd /actions-runner-1/;/actions-runner-1/config.sh --url https://github.com/${GITHUB_REPOSITORY} --token ${RUNNER_TOKEN} --name ${RUNNER_ID}-1 --labels ${VM_ID} --unattended --disableupdate" runner
+su -s /bin/bash -c "cd /actions-runner-2/;/actions-runner-2/config.sh --url https://github.com/${GITHUB_REPOSITORY} --token ${RUNNER_TOKEN} --name ${RUNNER_ID}-2 --labels ${VM_ID} --unattended --disableupdate" runner
 
 touch /.github-runner-config-ready
 

action.yml

@@ -9,8 +9,8 @@ inputs:
   runner_token:
     description: >-
       GitHub auth token, needs `repo`/`public_repo` scope: https://docs.github.com/en/rest/reference/actions#self-hosted-runners.
-    required: true    
-  project_id: 
+    required: true
+  project_id:
     description: >-
       ID of the Google Cloud Platform project. If provided, this will configure gcloud to use this project ID.
     required: false
@@ -51,6 +51,9 @@ inputs:
     description: Additional context about the workflow
     default: default
     required: true
+  gcp_credentials:
+    description: GCP JSON credentials
+    required: true
 
 outputs:
   label:
@@ -71,21 +74,43 @@ runs:
       run: |
         echo "❌ Job actions are not allowed to run in forks" >> $GITHUB_STEP_SUMMARY
         exit 1
+    - uses: actions/checkout@v3
+    - id: auth
+      name: Authenticate to Google Cloud
+      uses: google-github-actions/auth@v1
+      with:
+        credentials_json: ${{ inputs.gcp_credentials }}
+    - id: gcloud-auth
+      name: gcloud auth activate-service-account
+      shell: bash
+      run: |
+        gcloud auth activate-service-account --key-file ${{ steps.auth.outputs.credentials_file_path }}
     - id: gce-github-runner-script
       if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
-      shell: bash
-      run: >
-        ${{ github.action_path }}/action.sh
-        --command=start
-        --runner_token=${{ inputs.runner_token }}
-        --project_id=${{ inputs.project_id }}
-        --machine_zone=${{ inputs.machine_zone }}
-        --machine_type=${{ inputs.machine_type }}
-        --disk_size=${{ inputs.disk_size }}
-        --scopes=${{ inputs.scopes }}
-        --shutdown_timeout=${{ inputs.shutdown_timeout }}
-        --image_project=${{ inputs.image_project }}
-        --image=${{ inputs.image }}
-        --image_family=${{ inputs.image_family }}
-        --boot_disk_type=pd-ssd
-        --task=${{ inputs.task }}
+      uses: pyTooling/Actions/with-post-step@r0
+      with:
+        main: |
+          ${{ github.action_path }}/action.sh
+          --command=start
+          --runner_token=${{ inputs.runner_token }}
+          --project_id=${{ inputs.project_id }}
+          --machine_zone=${{ inputs.machine_zone }}
+          --machine_type=${{ inputs.machine_type }}
+          --disk_size=${{ inputs.disk_size }}
+          --scopes=${{ inputs.scopes }}
+          --shutdown_timeout=${{ inputs.shutdown_timeout }}
+          --image_project=${{ inputs.image_project }}
+          --image=${{ inputs.image }}
+          --image_family=${{ inputs.image_family }}
+          --boot_disk_type=pd-ssd
+          --task=${{ inputs.task }}
+        post: |
+          echo "Removing GCE VM..."
+
+          gcloud auth activate-service-account --key-file ${{ steps.auth.outputs.credentials_file_path }}
+          if [ -z "$(gcloud compute instances list | grep "${{ inputs.runner-label }}")" ]; then
+            # vm is gone
+            exit 0
+          fi
+
+          gcloud compute instances delete ${{ inputs.runner-label }} --quiet --zone ${{ inputs.machine-zone }}