Merge branch 'pterodactyl:1.0-develop' into 1.0-develop

pterodactyl-china · Dec 6, 2022 · d713180 · d713180
2 parents 87537b8 + 3432cad
commit d713180
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -1,22 +1,25 @@
-name: Publish Docker Image
+name: Docker
 
 on:
   push:
     branches:
       - develop
+      - 1.0-develop
+  pull_request:
+    branches:
+      - develop
+      - 1.0-develop
   release:
     types:
       - published
 
 jobs:
   push:
-    name: Push Image to GitHub Packages
+    name: Push
     runs-on: ubuntu-20.04
-    # Always run against a tag, even if the commit into the tag has [docker skip]
-    # within the commit message.
     if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
     steps:
-      - name: Code Checkout
+      - name: Code checkout
         uses: actions/checkout@v3
 
       - name: Docker metadata
@@ -44,25 +47,15 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Update app.php version
+      - name: Update version
         if: "github.event_name == 'release' && github.event.action == 'published'"
+        env:
+          REF: ${{ github.event.release.tag_name }}
         run: |
-          sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
-
-      - name: Build and Push (tag)
-        uses: docker/build-push-action@v3
-        if: "github.event_name == 'release' && github.event.action == 'published'"
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
+          sed -i "s/    'version' => 'canary',/    'version' => '${REF:1}',/" config/app.php
 
-      - name: Build and Push (develop)
+      - name: Build and Push
         uses: docker/build-push-action@v3
-        if: "github.event_name == 'push' && contains(github.ref, 'develop')"
         with:
           context: .
           file: ./Dockerfile

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -36,13 +36,13 @@ jobs:
           git push -u origin $BRANCH
           sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
           git add config/app.php
-          git commit -m "bump version for release"
+          git commit -m "ci(release): bump version"
           git push
 
       - name: Create release archive
         run: |
-          rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.xml Vagrantfile
-          tar -czf panel.tar.gz * .env.example .eslintignore .eslintrc.js
+          rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix 
+          tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
 
       - name: Extract changelog
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.11.1
+### Fixed
+* Fixed Panel Docker image showing `canary` as it's version.
+
 ## v1.11.0
 ### Changed (since 1.10.4)
 * Changed minimum PHP version requirement from `7.4` to `8.0`.