From b700aec51a39da8b920fd22882578246db2b0acd Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:18:08 -0400 Subject: [PATCH] Fix API publish --- .github/workflows/build-1215.yml | 18 ++++-------------- scripts/prepareRelease.sh | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-1215.yml b/.github/workflows/build-1215.yml index 928481f0..76b136ee 100644 --- a/.github/workflows/build-1215.yml +++ b/.github/workflows/build-1215.yml @@ -81,14 +81,11 @@ jobs: - name: Create MojmapPaperclipJar run: ./gradlew createMojmapPaperclipJar --stacktrace --parallel --no-daemon --no-configuration-cache - - name: Start API Publishing - id: publish-api + - name: Publish API + continue-on-error: true run: | - ( - ./gradlew publish --parallel --max-workers=4 > publish_api_log.txt 2>&1 - echo "API_PUBLISH_DONE=true" >> $GITHUB_ENV - ) & - echo "PUBLISH_PID=$!" >> $GITHUB_ENV + ./gradlew :leaf-api:publish + ./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true env: REPO_USER: ${{ secrets.REPO_USER }} REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }} @@ -112,13 +109,6 @@ jobs: GITHUB_REPO: ${{ github.repository }} BUILD_NUMBER: ${{ env.BUILD_NUMBER }} - - name: Wait for API Publishing - run: | - if ps -p ${{ env.PUBLISH_PID }} > /dev/null; then - wait ${{ env.PUBLISH_PID }} || true - fi - grep -i "error" publish_api_log.txt && echo "Found errors in log" || echo "No errors found" - - name: Release Leaf uses: softprops/action-gh-release@master with: diff --git a/scripts/prepareRelease.sh b/scripts/prepareRelease.sh index 3730204e..9894d73b 100755 --- a/scripts/prepareRelease.sh +++ b/scripts/prepareRelease.sh @@ -88,7 +88,7 @@ if [ $IS_UNSUPPORTED = true ]; then fi # Dev build warning -if [ "$IS_DEV" = true ]; then +if [ $IS_DEV = true ]; then { echo "" echo "> [!WARNING]"