diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 462c8bb0..809a5ed7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: java-version: "21" distribution: "zulu" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: add-job-summary: never generate-job-summary: false diff --git a/gradle.properties b/gradle.properties index 1ba5a4e0..554b95ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ group=org.leavesmc.leaves version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 paperRef=2ba1675c7506cadd8a540ea452e5dafb79ae8947 -preVersion=false +preVersion=true org.gradle.caching=true org.gradle.parallel=true diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index 1cf7cd49..a7378ed8 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -5,22 +5,21 @@ sha256() { prop() { grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//' } + +# shellcheck disable=SC2154 echo "$tag" project_id="leaves" -project_name="leaves" mcversion=$(prop mcVersion) -ctime=$(date -u +"%Y-%m-%dT%H:%M:%SZ") -pre=$(prop preVersion) -if [ $pre = "true" ]; then +if [ "$(prop preVersion)" = "true" ]; then channel="experimental" else channel="default" fi -promoted=false -number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l) +number=$(git log --oneline master ^"$(git describe --tags --abbrev=0)" | wc -l) changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g') jar_name="leaves-$mcversion.jar" -jar_sha256=`sha256 $jar_name` +jar_sha256=$(sha256 "$jar_name") +# shellcheck disable=SC2154 curl --location --request POST "https://api.leavesmc.org/v2/commit/build" --header "Content-Type: application/json" --header "Authentication: Bearer $secret_v2" --data-raw "{\"project_id\":\"$project_id\",\"version\":\"$mcversion\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"tag\":\"$tag\"}" \ No newline at end of file