mirror of
https://github.com/gravitl/netmaker.git
synced 2024-11-10 09:32:32 +08:00
Merge branch 'master' into NET-296
This commit is contained in:
commit
77e669aea6
2 changed files with 15 additions and 3 deletions
2
.github/workflows/branchtest.yml
vendored
2
.github/workflows/branchtest.yml
vendored
|
@ -21,7 +21,7 @@ jobs:
|
|||
needs: skip-check
|
||||
if: ${{ needs.skip-check.outputs.skip != 'true' }}
|
||||
outputs:
|
||||
netclientbranch: ${{ steps.checkbranch.outputs.netclientbranch }}
|
||||
netclientbranch: ${{ steps.getbranch.outputs.netclientbranch }}
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v3
|
||||
|
|
16
.github/workflows/deletedroplets.yml
vendored
16
.github/workflows/deletedroplets.yml
vendored
|
@ -16,6 +16,12 @@ jobs:
|
|||
with:
|
||||
run_id: ${{ github.event.workflow_run.id}}
|
||||
if_no_artifact_found: warn
|
||||
- name: get PR
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
echo "pull_request=$(gh api -H 'Accept: application/vnd.github+json' -H 'X-Github-Api-Version: 2022-11-28' \
|
||||
/repos/${{ github.repository}}/actions/runs/${{ github.event.workflow_run.id }} | jq .pull_requests[0].number)" >> $GITHUB_ENV
|
||||
- name: discord success message
|
||||
uses: appleboy/discord-action@master
|
||||
with:
|
||||
|
@ -23,7 +29,7 @@ jobs:
|
|||
webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
|
||||
color: "#42f545"
|
||||
username: "GitHub Bot"
|
||||
message: "${{ github.repository }}: ${{ github.event.workflow_run.name }} was successful: droplets from this workflow (tag ${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}) will be deleted in 15 min"
|
||||
message: "${{ github.repository }}: ${{ github.event.workflow_run.name }}:PR ${{ env.pull_request }} was successful: droplets from this workflow (tag ${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}) will be deleted in 15 min"
|
||||
file: ./results/results.log
|
||||
- name: delete droplets
|
||||
if: success() || failure()
|
||||
|
@ -46,6 +52,12 @@ jobs:
|
|||
with:
|
||||
run_id: ${{ github.event.workflow_run.id}}
|
||||
if_no_artifact_found: warn
|
||||
- name: get PR
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
echo "pull_request=$(gh api -H 'Accept: application/vnd.github+json' -H 'X-Github-Api-Version: 2022-11-28' \
|
||||
/repos/${{ github.repository}}/actions/runs/${{ github.event.workflow_run.id }} | jq .pull_requests[0].number)" >> $GITHUB_ENV
|
||||
- name: discord failure message
|
||||
uses: appleboy/discord-action@master
|
||||
with:
|
||||
|
@ -53,7 +65,7 @@ jobs:
|
|||
webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
|
||||
color: "#990000"
|
||||
username: "GitHub Bot"
|
||||
message: "${{ github.repository }}: ${{ github.event.workflow_run.name }} failed: droplets from this workflow (tag ${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt}}) will be deleted in 5 hours"
|
||||
message: "${{ github.repository }}: ${{ github.event.workflow_run.name }}:PR ${{ env.pull_request }} failed: droplets from this workflow (tag ${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt}}) will be deleted in 5 hours"
|
||||
file: ./results/results.log
|
||||
- name: discord error message
|
||||
uses: appleboy/discord-action@master
|
||||
|
|
Loading…
Reference in a new issue