Skip to content

Commit ab1fe1f

Browse files
committed
Add additional checking for full filepath
1 parent be93e6a commit ab1fe1f

File tree

4 files changed

+38
-12
lines changed

4 files changed

+38
-12
lines changed

.github/workflows/tagged-release.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
release_type: ${{steps.cf_release_type.outputs.value }}
1414
cf_project: ${{steps.cf_project.outputs.value }}
1515
mod_version: ${{steps.mod_version.outputs.value }}
16+
mod_id: ${{steps.mod_id.outputs.value }}
1617
steps:
1718
- name: Checkout
1819
uses: actions/checkout@v2
@@ -38,6 +39,13 @@ jobs:
3839
path: './gradle.properties'
3940
property: 'mod_version'
4041

42+
- name: Mod ID
43+
id: mod_id
44+
uses: christian-draeger/[email protected]
45+
with:
46+
path: './gradle.properties'
47+
property: 'mod_id'
48+
4149
changelog:
4250
name: Generate Changelog (tags)
4351
runs-on: ubuntu-latest
@@ -170,13 +178,17 @@ jobs:
170178
changelog/CHANGELOG.md
171179
buildfiles/**${{ needs.vars.outputs.mod_version }}**.jar
172180
181+
- name: Full File
182+
id: filename
183+
run: echo "::set-output name=fullpath::buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar"
184+
173185
- name: Create CurseForge Release
174186
uses: itsmeow/curseforge-upload@master
175187
with:
176188
token: ${{ secrets.CF_API_TOKEN }}
177189
project_id: ${{ needs.vars.outputs.cf_project }}
178190
game_endpoint: minecraft
179-
file_path: buildfiles/**${{ needs.vars.outputs.mod_version }}**.jar
191+
file_path: ${{ steps.filename.outputs.fullpath }}
180192
changelog: ${{ steps.changelog.outputs.changelog }}
181193
changelog_type: markdown
182194
game_versions: java:Java 8,Forge

.github/workflows/test-build.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010
outputs:
1111
release_type: ${{steps.cf_release_type.outputs.value }}
12+
cf_project: ${{steps.cf_project.outputs.value }}
1213
mod_version: ${{steps.mod_version.outputs.value }}
14+
mod_id: ${{steps.mod_id.outputs.value }}
1315
steps:
1416
- name: Checkout
1517
uses: actions/checkout@v2
@@ -21,12 +23,27 @@ jobs:
2123
path: './gradle.properties'
2224
property: 'cf_release_type'
2325

26+
- name: Project ID
27+
id: cf_project
28+
uses: christian-draeger/[email protected]
29+
with:
30+
path: './gradle.properties'
31+
property: 'cf_project'
32+
2433
- name: Mod Version
2534
id: mod_version
2635
uses: christian-draeger/[email protected]
2736
with:
2837
path: './gradle.properties'
2938
property: 'mod_version'
39+
40+
- name: Mod ID
41+
id: mod_id
42+
uses: christian-draeger/[email protected]
43+
with:
44+
path: './gradle.properties'
45+
property: 'mod_id'
46+
3047
changelog:
3148
name: Generate Changelog (tags)
3249
runs-on: ubuntu-latest
@@ -149,13 +166,8 @@ jobs:
149166
run: cat changelog/CHANGELOG.md
150167
- name: ShowFiles
151168
run: dir buildfiles
152-
# - name: Create Release
153-
# uses: "marvinpinto/action-automatic-releases@latest"
154-
# with:
155-
# title: "Release ${{ github.event.release.tag_name }}"
156-
# repo_token: "${{ secrets.GITHUB_TOKEN }}"
157-
# prerelease: false
158-
# files: |
159-
# changelog/CHANGELOG.md
160-
# LICENSE.txt
161-
# buildfiles/*
169+
- name: Full File
170+
id: filename
171+
run: echo "::set-output name=fullpath::${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar"
172+
- name: Echo full file
173+
run: echo "${{ steps.filename.outputs.fullpath }}"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apply plugin: 'maven-publish'
1717

1818
version = "${mod_version}"
1919
group = 'com.robotgryphon.compactmachines' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
20-
archivesBaseName = 'compactmachines'
20+
archivesBaseName = mod_id
2121

2222
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
2323

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ org.gradle.daemon=false
66
minecraft_version=1.16.4
77
forge_version=35.1.13
88
mappings_version=20201028-1.16.3
9+
10+
mod_id=compactmachines
911
mod_version=4.0.0-alpha.6
1012

1113
# Dependencies and Libs

0 commit comments

Comments
 (0)