diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c2fa6edbf..6874f7f20 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ on: jobs: ui: name: UI - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: contents: read strategy: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e0375787c..9bfaf70a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ on: jobs: tests: name: Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: contents: read strategy: diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 6385f016c..86db283f8 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -16,7 +16,7 @@ on: jobs: push: name: Push - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))" permissions: contents: read diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 78f225609..44571e55d 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -13,7 +13,7 @@ on: jobs: lint: name: Lint - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: contents: read steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0ba2b6971..fa8f29b81 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,7 @@ on: jobs: release: name: Release - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: contents: write # write is required to create releases and push. steps: @@ -31,14 +31,14 @@ jobs: env: REF: ${{ github.ref }} run: | - BRANCH=release/${REF:10} - git config --local user.email "ci@pterodactyl.io" - git config --local user.name "Pterodactyl CI" - git checkout -b $BRANCH - git push -u origin $BRANCH + BRANCH=release/"${REF:10}" + git config --local user.email 'ci@pterodactyl.io' + git config --local user.name 'Pterodactyl CI' + git checkout -b "$BRANCH" + git push -u origin "$BRANCH" sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:11}',/" config/app.php git add config/app.php - git commit -m "ci(release): bump version" + git commit -m 'ci(release): bump version' git push - name: Create release archive @@ -56,7 +56,7 @@ jobs: run: | SUM=`sha256sum panel.tar.gz` echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG - echo $SUM > checksum.txt + echo "$SUM" > checksum.txt - name: Create release id: create_release @@ -67,25 +67,6 @@ jobs: draft: true prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }} body_path: ./RELEASE_CHANGELOG - - - name: Upload release archive - 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 }} - asset_path: panel.tar.gz - asset_name: panel.tar.gz - asset_content_type: application/gzip - - - name: 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 }} - asset_path: ./checksum.txt - asset_name: checksum.txt - asset_content_type: text/plain + files: | + panel.tar.gz + checksum.txt