diff --git a/.github/workflows/build_1.21.4.yml b/.github/workflows/build_1.21.4.yml index 60c6455..bdcef78 100644 --- a/.github/workflows/build_1.21.4.yml +++ b/.github/workflows/build_1.21.4.yml @@ -36,13 +36,11 @@ jobs: export MAVEN_REPO_USER=${{ secrets.MAVEN_REPO_USER }} export MAVEN_REPO_PASSWORD=${{ secrets.MAVEN_REPO_PASSWORD }} ./gradlew publish -PpublishDevBundle=true - - name: SetENV - run: sh scripts/SetENV.sh - name: Upload Artifact uses: "actions/upload-artifact@v4" with: name: "${{ env.project_id_b }} CI Artifacts" - path: "build/libs/*.jar" + path: "luminol-server/build/libs/*.jar" - name: Create Release if: "!contains(github.event.commits[0].message, '[release skip]')" uses: ncipollo/release-action@v1.14.0 @@ -61,11 +59,3 @@ jobs: prerelease: ${{ env.pre }} makeLatest: ${{ env.make_latest }} token: "${{ secrets.GITHUB_TOKEN }}" - - name: Push to API - if: "!contains(github.event.commits[0].message, '[release skip]')" - continue-on-error: true - env: - secret_v2: ${{ secrets.API_KEY }} - tag: ${{ env.tag }} - project_id: ${{ env.project_id }} - run: sh scripts/PushToAPI.sh diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh deleted file mode 100644 index 2955314..0000000 --- a/scripts/PushToAPI.sh +++ /dev/null @@ -1,46 +0,0 @@ -sha256() { - sha256sum $1 | awk '{print $1}' -} -prop() { - grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//' -} - -mcversion_group=$(prop GroupMCV) -mcversion=$(prop mcVersion) -pre=$(prop preVersion) -pro_id_mcv=$project_id-$mcversion - -if [ $pre = "true" ]; then - channel="experimental" -else - channel="default" -fi - -changes=$(git log -1 --pretty="[{\"commit\": \"%H\", \"message\": \"%s\", \"summary\": \"%s\"}]") -jar_sha256=`sha256 build/libs/$pro_id_mcv-paperclip.jar` -jar_name="$pro_id_mcv-paperclip.jar" -ctime=$(date -u +"%s")"000" - -# v2 -json=$(printf "{\\\"channel\\\":\\\"%s\\\", \\\"jar_name\\\":\\\"%s\\\", \\\"sha256\\\":\\\"%s\\\", \\\"tag\\\":\\\"%s\\\", \\\"time\\\":\\\"%s\\\", \\\"changes\\\":\\\"%s\\\"}" \ - "$channel" "$jar_name" "$jar_sha256" "$tag" "$ctime" "$changes") -echo "[DEBUG] $json" -echo "[DEBUG] $changes" -echo "[DEBUG] curl --location --request POST \"https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit\" \ - -H \"Content-Type: application/x-www-form-urlencoded\" \ - -H \"Authorization: $secret_v2\" \ - --data-urlencode \"channel=$channel\" \ - --data-urlencode \"jar_name=$jar_name\" \ - --data-urlencode \"sha256=$jar_sha256\" \ - --data-urlencode \"release_tag=$tag\" \ - --data-urlencode \"time=$ctime\" \ - --data-urlencode \"changes=$changes\"" -curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" \ - -H "Content-Type: application/x-www-form-urlencoded" \ - -H "Authorization: $secret_v2" \ - --data-urlencode "channel=$channel" \ - --data-urlencode "jar_name=$jar_name" \ - --data-urlencode "sha256=$jar_sha256" \ - --data-urlencode "release_tag=$tag" \ - --data-urlencode "time=$ctime" \ - --data-urlencode "changes=$changes" \ No newline at end of file diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh deleted file mode 100644 index 64c1414..0000000 --- a/scripts/SetENV.sh +++ /dev/null @@ -1,32 +0,0 @@ -prop() { - grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//' -} - -project_id="luminol" -project_id_b="Luminol" - -commitid=$(git log --pretty='%h' -1) -mcversion=$(prop mcVersion) -grdversion=$(prop version) -preVersion=$(prop preVersion) -release_tag="$mcversion-$commitid" -jarName="$project_id-$mcversion-paperclip.jar" -jarName_bundler="$project_id-$mcversion-bundler.jar" -jarName_dir="build/libs/$jarName" -jarName_bundler_dir="build/libs/$jarName_bundler" -make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") - -mv build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir -mv build/libs/$project_id-bundler-$grdversion-mojmap.jar $jarName_bundler_dir - -echo "project_id=$project_id" >> $GITHUB_ENV -echo "project_id_b=$project_id_b" >> $GITHUB_ENV -echo "commit_id=$commitid" >> $GITHUB_ENV -echo "commit_msg=$(git log --pretty='> [%h] %s' -1)" >> $GITHUB_ENV -echo "mcversion=$mcversion" >> $GITHUB_ENV -echo "pre=$preVersion" >> $GITHUB_ENV -echo "tag=$release_tag" >> $GITHUB_ENV -echo "jar=$jarName" >> $GITHUB_ENV -echo "jar_dir=$jarName_dir" >> $GITHUB_ENV -echo "jar_dir_bundler=$jarName_bundler_dir" >> $GITHUB_ENV -echo "make_latest=$make_latest" >> $GITHUB_ENV \ No newline at end of file