Skip to content

Commit 4ef04aa

Browse files
committed
Update actions
1 parent 9ffb5d2 commit 4ef04aa

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
ghcr.io/pterodactyl/panel:${GITHUB_REF}
3131
- name: Release Development Build
3232
uses: docker/build-push-action@v2
33-
if: contains(github.ref, 'develop')
33+
if: contains(github.ref, 'develop') && && !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]')
3434
with:
3535
push: true
3636
tags: |

.github/workflows/release.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
name: "Release"
2-
1+
name: Create Release
32
on:
43
push:
54
tags:
65
- 'v*'
7-
86
jobs:
97
release:
108
runs-on: ubuntu-20.04
@@ -13,7 +11,7 @@ jobs:
1311
- uses: actions/setup-node@v1
1412
with:
1513
node-version: '12'
16-
14+
1715
- name: Create release branch and bump version
1816
env:
1917
REF: ${{ github.ref }}
@@ -32,7 +30,7 @@ jobs:
3230
run: |
3331
yarn install
3432
yarn run build:production
35-
33+
3634
- name: Create release archive
3735
run: |
3836
rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.dusk.xml phpunit.xml Vagrantfile
@@ -63,25 +61,25 @@ jobs:
6361
body_path: ./RELEASE_CHANGELOG
6462
draft: true
6563
prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
66-
64+
6765
- name: Upload binary
6866
id: upload-release-archive
6967
uses: actions/upload-release-asset@v1
7068
env:
7169
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7270
with:
73-
upload_url: ${{ steps.create_release.outputs.upload_url }}
71+
upload_url: ${{ steps.create_release.outputs.upload_url }}
7472
asset_path: panel.tar.gz
7573
asset_name: panel.tar.gz
7674
asset_content_type: application/gzip
77-
75+
7876
- name: Upload checksum
79-
id: upload-release-checksum
77+
id: upload-release-checksum
8078
uses: actions/upload-release-asset@v1
8179
env:
8280
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8381
with:
84-
upload_url: ${{ steps.create_release.outputs.upload_url }}
82+
upload_url: ${{ steps.create_release.outputs.upload_url }}
8583
asset_path: ./checksum.txt
8684
asset_name: checksum.txt
8785
asset_content_type: text/plain

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: tests
1+
name: Run Test Suite
22
on:
33
push:
44
branch-ignore:

0 commit comments

Comments
 (0)