Skip to content

Commit 5c1f304

Browse files
author
Xikaro
committed
workflows fix
1 parent 2d33da5 commit 5c1f304

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ jobs:
176176
if: startsWith(github.ref, 'refs/tags/')
177177
uses: ./.github/workflows/release.yml
178178
with:
179-
PROJECT_NAME: ${{ needs.modpack-info.outputs.project_name }}
180-
PROJECT_VERSION: ${{ needs.modpack-info.outputs.project_version }}
181-
MC_VERSION: ${{ needs.modpack-info.outputs.mc_version }}
182-
CHANGELOG: ${{ needs.modpack-info.outputs.changelog }}
179+
project_name: ${{ needs.modpack-info.outputs.project_name }}
180+
project_version: ${{ needs.modpack-info.outputs.project_version }}
181+
mc_version: ${{ needs.modpack-info.outputs.mc_version }}
182+
changelog: ${{ needs.modpack-info.outputs.changelog }}
183183
secrets: inherit
184184

‎.github/workflows/release.yml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ run-name: "Release #${{ github.run_number }}"
44
on:
55
workflow_call:
66
inputs:
7-
PROJECT_NAME:
7+
project_name:
88
required: true
99
type: string
10-
PROJECT_VERSION:
10+
project_version:
1111
required: true
1212
type: string
13-
MC_VERSION:
13+
mc_version:
1414
required: true
1515
type: string
16-
CHANGELOG:
16+
changelog:
1717
required: true
1818
type: string
1919

@@ -37,44 +37,44 @@ jobs:
3737
- name: Download cf modpack
3838
uses: actions/download-artifact@v4.1.0
3939
with:
40-
name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-cf
40+
name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf
4141

4242
- name: Download serverpack
4343
uses: actions/download-artifact@v4.1.0
4444
with:
45-
name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server
46-
47-
- name: Upload Curseforge
48-
id: cf_release
49-
uses: SwitchAlpha/upload-curseforge-modpack-action@master
50-
with:
51-
api-token: ${{ secrets.CF_API_TOKEN }}
52-
project-id: ${{ env.CF_PROJECT_ID }}
53-
modpack-path: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-cf.zip
54-
modpack-server-path: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server.zip
55-
changelog: ${{ inputs.CHANGELOG }}
56-
changelog-format: markdown
57-
game-version: ${{ inputs.MC_VERSION }}
58-
display-name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}
59-
server-display-name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server
60-
release-type: ${{ env.RELEASE_TYPE }}
45+
name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
46+
47+
# - name: Upload Curseforge
48+
# id: cf_release
49+
# uses: SwitchAlpha/upload-curseforge-modpack-action@master
50+
# with:
51+
# api-token: ${{ secrets.CF_API_TOKEN }}
52+
# project-id: ${{ env.CF_PROJECT_ID }}
53+
# modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip
54+
# modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
55+
# changelog: ${{ inputs.changelog }}
56+
# changelog-format: markdown
57+
# game-version: ${{ inputs.mc_version }}
58+
# display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}
59+
# server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
60+
# release-type: ${{ env.RELEASE_TYPE }}
6161

6262
- name: Send Discord message
6363
uses: tsickert/discord-webhook@v5.4.0
6464
with:
6565
webhook-url: ${{secrets.RELEASES_1_20}}
6666
username: "TerraFirmaGreg"
6767
avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge_logo.png"
68-
embed-title: Release ${{ inputs.PROJECT_VERSION }}
69-
embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ inputs.PROJECT_VERSION }}
68+
embed-title: Release ${{ inputs.project_version }}
69+
embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ inputs.project_version }}
7070
embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png
7171
embed-description: |
7272
**Release Type**: `${{ env.RELEASE_TYPE }}`
73-
**GameVersion**: `${{ inputs.MC_VERSION }}`
74-
**Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ steps.cf_release.outputs.id }})
73+
**GameVersion**: `${{ inputs.mc_version }}`
74+
**Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5012772)
7575
7676
**Changelog**
77-
```${{ inputs.CHANGELOG }}```
77+
```${{ inputs.changelog }}```
7878
embed-color: "#57F287"
7979

8080
release-github:
@@ -91,13 +91,13 @@ jobs:
9191
with:
9292
prerelease: false
9393
generate_release_notes: true
94-
name: ${{ inputs.PROJECT_VERSION }}
94+
name: ${{ inputs.project_version }}
9595
body: ${{ inputs.CHANGELOG }}
9696
files: |
97-
${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-cf.zip
98-
${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-mmc.zip
99-
${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server.zip
100-
tag_name: ${{ inputs.PROJECT_VERSION }}
97+
${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip
98+
${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip
99+
${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
100+
tag_name: ${{ inputs.project_version }}
101101
env:
102102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103103

@@ -128,13 +128,13 @@ jobs:
128128
# with:
129129
# api-token: ${{ secrets.MODRINTH_API_TOKEN }}
130130
# project-id: ${{ env.MODRINTH_PROJECT_ID }}
131-
# modpack-path: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-mrd.zip
132-
# modpack-server-path: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server.zip
131+
# modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-mrd.zip
132+
# modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
133133
# changelog: "${{ inputs.CHANGELOG }}"
134134
# changelog-format: markdown
135-
# game-version: ${{ inputs.mcversion }}
136-
# display-name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}
137-
# server-display-name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server
135+
# game-version: ${{ inputs.mc_version }}
136+
# display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}
137+
# server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
138138
# release-type: ${{ env.RELEASE_TYPE }}
139139

140140
close-fixed-issues:
@@ -149,7 +149,7 @@ jobs:
149149
uses: juraj-hrivnak/close-issues-based-on-label@master
150150
env:
151151
LABEL: "2. status: fixed in dev"
152-
VERSION: ${{ inputs.PROJECT_VERSION }}
152+
VERSION: ${{ inputs.project_version }}
153153
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
154154

155155

0 commit comments

Comments
 (0)