From 8ef633bfe89b625c070cd071869bd7cace50ab2f Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Wed, 8 Nov 2023 16:36:36 +0000 Subject: [PATCH] get the right MC version in CI scripts and add runs/ dir to git ignore --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- .gitignore | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11fdd9cd..a0889dee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - name: Set up mod metadata id: mod_meta run: | - echo mc_version=$(grep ^mc_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT + echo mc_version=$(grep ^minecraft_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT - name: Build JAR uses: gradle/gradle-build-action@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ce8552c..1fc060d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: id: mod_meta run: | echo mod_version=$(grep ^mod_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT - echo mc_version=$(grep ^mc_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT + echo mc_version=$(grep ^minecraft_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT - name: Publish to Modmaven uses: gradle/gradle-build-action@v2 env: diff --git a/.gitignore b/.gitignore index 86327501..26c7461d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ classes eclipse run run-* +runs conf *.xcf *.pl