diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 758512d98..84a7ceaff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,30 +29,6 @@ env: RELEASE_TYPE: "beta" jobs: - release-github: - name: Deploy to GitHub - runs-on: ubuntu-latest - steps: - - name: Download modpack - uses: actions/download-artifact@v4.1.0 - with: - merge-multiple: true - - - name: Create release - uses: softprops/action-gh-release@v1 - with: - prerelease: false - generate_release_notes: true - name: ${{ inputs.project_version }} - body: ${{ inputs.changelog }} - files: | - ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip - ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - tag_name: ${{ inputs.tag }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - release-curseforge: name: Deploy to CurseForge runs-on: ubuntu-latest @@ -64,7 +40,7 @@ jobs: echo '::error::No value found for secret key `CF_API_TOKEN`. See https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 fi - - name: Download modpack + - name: Download cf modpack uses: actions/download-artifact@v4.1.0 with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf @@ -74,14 +50,17 @@ jobs: with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + - name: Display structure of downloaded files + run: ls -R ./ + - name: Upload Curseforge id: cf_release uses: SwitchAlpha/upload-curseforge-modpack-action@master with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: ${{ env.CF_PROJECT_ID }} - modpack-path: "./${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip" - modpack-server-path: "./${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip" + modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip changelog: "${{ inputs.changelog }}" changelog-format: markdown game-version: ${{ inputs.mcversion }} @@ -115,6 +94,31 @@ jobs: ] content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ inputs.news }}" + release-github: + name: Deploy to GitHub + runs-on: ubuntu-latest + needs: [release-curseforge] + steps: + - name: Download modpack + uses: actions/download-artifact@v4.1.0 + with: + merge-multiple: true + + - name: Create release + uses: softprops/action-gh-release@v1 + with: + prerelease: false + generate_release_notes: true + name: ${{ inputs.project_version }} + body: ${{ inputs.changelog }} + files: | + ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + tag_name: ${{ inputs.tag }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # release-modrinth: # name: Deploy to Modrinth # runs-on: ubuntu-latest