From 4ef04aa604679dff248f8818c35c61d456f1bdcd Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 14 Nov 2020 20:01:02 -0800
Subject: [PATCH] Update actions

---
 .github/workflows/docker.yml  |  2 +-
 .github/workflows/release.yml | 18 ++++++++----------
 .github/workflows/tests.yml   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 90006393a..19a8b0707 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,7 +30,7 @@ jobs:
             ghcr.io/pterodactyl/panel:${GITHUB_REF}
       - name: Release Development Build
         uses: docker/build-push-action@v2
-        if: contains(github.ref, 'develop')
+        if: contains(github.ref, 'develop') && && !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]')
         with:
           push: true
           tags: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 06582c0e6..91e39431f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,10 +1,8 @@
-name: "Release"
-
+name: Create Release
 on:
   push:
     tags:
       - 'v*'
-
 jobs:
   release:
     runs-on: ubuntu-20.04
@@ -13,7 +11,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '12'
-      
+
       - name: Create release branch and bump version
         env:
           REF: ${{ github.ref }}
@@ -32,7 +30,7 @@ jobs:
         run: |
           yarn install
           yarn run build:production
-      
+
       - name: Create release archive
         run: |
           rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.dusk.xml phpunit.xml Vagrantfile
@@ -63,25 +61,25 @@ jobs:
           body_path: ./RELEASE_CHANGELOG
           draft: true
           prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-      
+
       - name: Upload binary
         id: upload-release-archive
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: panel.tar.gz
           asset_name: panel.tar.gz
           asset_content_type: application/gzip
-      
+
       - name: Upload checksum
-        id: upload-release-checksum 
+        id: upload-release-checksum
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./checksum.txt
           asset_name: checksum.txt
           asset_content_type: text/plain
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 00c37cc59..5d9c21e68 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: tests
+name: Run Test Suite
 on:
   push:
     branch-ignore: