From 8ca6ec8ec17505ceffd7795d8ecf8c8f1b218ddb Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 3 Feb 2025 19:15:01 -0500 Subject: [PATCH] fix: Update to MorphoCloud/MorphoCloudWorkflow@df8cf75 List of MorphoCloudWorkflow changes: ``` $ git shortlog d5be05b..df8cf75 --no-merges Jean-Christophe Fillion-Robin (1): fix: Use "github/lock" instead of invalid "actions/lock" ``` See https://github.com/MorphoCloud/MorphoCloudWorkflow/compare/d5be05b...df8cf75 --- .../control-instance-from-workflow.yml | 16 ++++++------- .github/workflows/control-instance.yml | 23 +++++++++--------- .github/workflows/create-instance.yml | 23 +++++++++--------- .../workflows/delete-instance-and-volume.yml | 23 +++++++++--------- .github/workflows/delete-volume.yml | 24 +++++++++---------- .../workflows/update-issue-from-workflow.yml | 16 ++++++------- .github/workflows/update-issue.yml | 16 ++++++------- .github/workflows/validate-request.yml | 20 +++++++++------- 8 files changed, 79 insertions(+), 82 deletions(-) diff --git a/.github/workflows/control-instance-from-workflow.yml b/.github/workflows/control-instance-from-workflow.yml index c5163b0e..a4c2caed 100644 --- a/.github/workflows/control-instance-from-workflow.yml +++ b/.github/workflows/control-instance-from-workflow.yml @@ -35,16 +35,16 @@ jobs: control: runs-on: self-hosted steps: - - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ inputs.issue_number }} - timeout: 3600 + mode: lock + + - uses: actions/checkout@v4 - name: Control instance run: | @@ -69,10 +69,10 @@ jobs: mail_server_password: ${{secrets.MAIL_PASSWORD}} - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ inputs.issue_number }} - action: unlock + mode: unlock diff --git a/.github/workflows/control-instance.yml b/.github/workflows/control-instance.yml index f9df227d..fe01f9f4 100644 --- a/.github/workflows/control-instance.yml +++ b/.github/workflows/control-instance.yml @@ -20,6 +20,14 @@ jobs: contains(github.event.comment.body, '/shelve') || contains(github.event.comment.body, '/delete_instance') ) }} steps: + - name: Acquire lock + uses: github/lock@v2 + if: always() + with: + environment: + lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ + github.event.issue.number }} + mode: lock - name: unshelve command id: unshelve_command @@ -90,15 +98,6 @@ jobs: - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 - if: always() - with: - path: - lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ - github.event.issue.number }} - timeout: 3600 - - name: Control instance id: control_instance if: ${{ steps.command.outputs.continue == 'true' }} @@ -114,10 +113,10 @@ jobs: mail_server_password: ${{secrets.MAIL_PASSWORD}} - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ github.event.issue.number }} - action: unlock + mode: unlock diff --git a/.github/workflows/create-instance.yml b/.github/workflows/create-instance.yml index c3283d30..ff51f57d 100644 --- a/.github/workflows/create-instance.yml +++ b/.github/workflows/create-instance.yml @@ -15,6 +15,14 @@ jobs: ${{ !github.event.issue.pull_request && ( contains(github.event.comment.body, '/create') ) }} steps: + - name: Acquire lock + uses: github/lock@v2 + if: always() + with: + environment: + lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ + github.event.issue.number }} + mode: lock - name: create command id: create_command @@ -28,15 +36,6 @@ jobs: - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 - if: always() - with: - path: - lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ - github.event.issue.number }} - timeout: 3600 - - name: Add "request:approved" label uses: actions/github-script@v7 with: @@ -700,10 +699,10 @@ jobs: send_email: ✅ - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ github.event.issue.number }} - action: unlock + mode: unlock diff --git a/.github/workflows/delete-instance-and-volume.yml b/.github/workflows/delete-instance-and-volume.yml index 177c9d5d..e5588d45 100644 --- a/.github/workflows/delete-instance-and-volume.yml +++ b/.github/workflows/delete-instance-and-volume.yml @@ -15,6 +15,14 @@ jobs: ${{ !github.event.issue.pull_request && ( contains(github.event.comment.body, '/delete_all') ) }} steps: + - name: Acquire lock + uses: github/lock@v2 + if: always() + with: + environment: + lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ + github.event.issue.number }} + mode: lock - name: delete_instance_and_volume command id: delete_instance_and_volume_command @@ -28,15 +36,6 @@ jobs: - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 - if: always() - with: - path: - lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ - github.event.issue.number }} - timeout: 3600 - - name: Delete volume id: delete_volume if: @@ -66,10 +65,10 @@ jobs: mail_server_password: ${{secrets.MAIL_PASSWORD}} - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ github.event.issue.number }} - action: unlock + mode: unlock diff --git a/.github/workflows/delete-volume.yml b/.github/workflows/delete-volume.yml index 423005f7..0a28d6e4 100644 --- a/.github/workflows/delete-volume.yml +++ b/.github/workflows/delete-volume.yml @@ -15,7 +15,14 @@ jobs: ${{ !github.event.issue.pull_request && ( contains(github.event.comment.body, '/delete_volume') ) }} steps: - + - name: Acquire lock + uses: github/lock@v2 + if: always() + with: + environment: + lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ + github.event.issue.number }} + mode: lock - name: delete_volume command id: delete_volume_command @@ -29,15 +36,6 @@ jobs: - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 - if: always() - with: - path: - lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ - github.event.issue.number }} - timeout: 3600 - - name: Delete volume id: delete_volume if: ${{ steps.delete_volume_command.outputs.continue == 'true' }} @@ -49,10 +47,10 @@ jobs: volume_name_suffix: ${{ vars.VOLUME_NAME_SUFFIX }} - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ github.event.issue.number }} - action: unlock + mode: unlock diff --git a/.github/workflows/update-issue-from-workflow.yml b/.github/workflows/update-issue-from-workflow.yml index 4616f8ee..25211f40 100644 --- a/.github/workflows/update-issue-from-workflow.yml +++ b/.github/workflows/update-issue-from-workflow.yml @@ -31,16 +31,16 @@ jobs: control: runs-on: self-hosted steps: - - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ inputs.issue_number }} - timeout: 3600 + mode: lock + + - uses: actions/checkout@v4 - name: Add comment run: | @@ -62,10 +62,10 @@ jobs: string_encryption_key: ${{ secrets.STRING_ENCRYPTION_KEY }} - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ inputs.issue_number }} - action: unlock + mode: unlock diff --git a/.github/workflows/update-issue.yml b/.github/workflows/update-issue.yml index 1a97b15d..c6b28d9e 100644 --- a/.github/workflows/update-issue.yml +++ b/.github/workflows/update-issue.yml @@ -44,16 +44,14 @@ jobs: "${{ vars.MORPHOCLOUD_GITHUB_ADMINS }},${{ github.event.issue.user.login }}" - - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ github.event.issue.number }} - timeout: 3600 + mode: lock - name: Set command metadata id: command @@ -83,6 +81,8 @@ jobs: DECODE_EMAIL_COMMAND_CONTINUE: ${{ steps.decode_email_command.outputs.continue }} + - uses: actions/checkout@v4 + - name: Update issue description if: ${{ steps.command.outputs.continue == 'true' }} uses: ./.github/actions/update-issue-description @@ -93,10 +93,10 @@ jobs: string_encryption_key: ${{ secrets.STRING_ENCRYPTION_KEY }} - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ github.event.issue.number }} - action: unlock + mode: unlock diff --git a/.github/workflows/validate-request.yml b/.github/workflows/validate-request.yml index d244ada0..e0f9618f 100644 --- a/.github/workflows/validate-request.yml +++ b/.github/workflows/validate-request.yml @@ -11,10 +11,12 @@ on: description: "Issue number" required: true -# Permissions needed for reacting to IssueOps commands on issues permissions: + # Permissions needed for reacting to IssueOps commands on issues issues: write checks: read + # Permissions needed for lock/unlock + contents: write jobs: validate: @@ -36,16 +38,16 @@ jobs: env: EVENT_NAME: ${{ github.event_name }} - - uses: actions/checkout@v4 - - name: Acquire lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ steps.collect_inputs.outputs.issue_number }} - timeout: 3600 + mode: lock + + - uses: actions/checkout@v4 - name: Extract fields id: extract @@ -245,10 +247,10 @@ jobs: See details [here](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}). - name: Release lock - uses: actions/lock@v2 + uses: github/lock@v2 if: always() with: - path: + environment: lock-${{ vars.MORPHOCLOUD_OS_CLOUD }}-instance-${{ steps.collect_inputs.outputs.issue_number }} - action: unlock + mode: unlock