From bbb674ef76ebc98e933d6f6316ec1fb5a5f793e6 Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 29 Jul 2023 21:57:44 +0200 Subject: fix workflow the name "CHANGELOG-discord" was the problem. GitHub mistakenly interpreted '-discord' as a command. Fix would be underscore or rename it. --- .github/workflows/buildrelease.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index 34807542..66b4bf70 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -41,6 +41,13 @@ jobs: run: | CHANGELOG=$(sed '/___/Q' CHANGELOG.md) CHANGELOG=$(echo "$CHANGELOG" | sed 1d) + + CHANGELOGtmp="${CHANGELOG//'%'/'%25'}" + CHANGELOGtmp="${CHANGELOGtmp//$'\n'/'%0A'}" + CHANGELOGtmp="${CHANGELOGtmp//$'\r'/'%0D'}" + + echo "::set-output name=changelog::$CHANGELOGtmp" + echo "Changelog:\n$CHANGELOG" changelog="${CHANGELOG}" @@ -81,12 +88,11 @@ jobs: CHANGELOG=$(echo -n "$modified_changelog") fi - CHANGELOG-discord="${CHANGELOG//'%'/'%25'}" - CHANGELOG-discord="${CHANGELOG//$'\n'/'%0A'}" - CHANGELOG-discord="${CHANGELOG//$'\r'/'%0D'}" + CHANGELOG="${CHANGELOG//'%'/'%25'}" + CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" + CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" - echo "::set-output name=changelog::$changelog" - echo "::set-output name=changelog-discord::$CHANGELOG-discord" + echo "::set-output name=changelog_discord::CHANGELOG" - uses: actions/github-script@v2 id: fname @@ -124,12 +130,9 @@ jobs: with: args: | "@Update-Notification" - "Skyblocker ${{ steps.version_tag.outputs.value }}" + "## Skyblocker ${{ steps.version_tag.outputs.value }}" "" - "Changelog" - "```md" - "${{ steps.read_changelog.outputs.changelog-discord }}" - "```" + "${{ steps.read_changelog.outputs.changelog_discord }}" ":inbox_tray: Download latest version on Modrinth or Github:" "<:modrinth:900697862206287882> <${{ steps.modrinth.outputs.url }}>" "<:github:900697885706952725> <${{ steps.uploadrelease.outputs.url }}>" -- cgit From 34003f6eadac39a8aec6286cc34e16a5a46c1710 Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 29 Jul 2023 21:59:46 +0200 Subject: Update buildrelease.yml --- .github/workflows/buildrelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index 66b4bf70..e941eeb3 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -92,7 +92,7 @@ jobs: CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" - echo "::set-output name=changelog_discord::CHANGELOG" + echo "::set-output name=changelog_discord::$CHANGELOG" - uses: actions/github-script@v2 id: fname -- cgit From a75a7edc2627351967ed15a3371ae232da0c530a Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 29 Jul 2023 22:18:04 +0200 Subject: update actions hope this does not brake the workflow --- .github/workflows/beta.yml | 8 ++++---- .github/workflows/buildrelease.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index d7447766..fadce733 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -15,9 +15,9 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/github-script@v2 + - uses: actions/github-script@v6 with: result-encoding: string script: | @@ -38,7 +38,7 @@ jobs: - name: Build with Gradle run: ./gradlew build - - uses: actions/github-script@v2 + - uses: actions/github-script@v6 id: fname with: result-encoding: string @@ -46,7 +46,7 @@ jobs: const fs = require("fs") return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0].replace(".jar", ""); - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{ steps.fname.outputs.result }} path: build/libs/ \ No newline at end of file diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index e941eeb3..7f0a38b4 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -17,7 +17,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 uses: actions/setup-java@v2 with: @@ -30,7 +30,7 @@ jobs: - name: Build with Gradle run: ./gradlew build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ @@ -94,7 +94,7 @@ jobs: echo "::set-output name=changelog_discord::$CHANGELOG" - - uses: actions/github-script@v2 + - uses: actions/github-script@v6 id: fname with: result-encoding: string -- cgit From ea7de7a6c63930a09b2d63b65b2ba6744a9051fd Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 29 Jul 2023 22:26:11 +0200 Subject: update actions/setup-java --- .github/workflows/beta.yml | 4 ++-- .github/workflows/buildrelease.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index fadce733..4ab11edf 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -27,9 +27,9 @@ jobs: fs.writeFileSync("./gradle.properties", file); - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: 'microsoft' java-version: '17' - name: Grant execute permission for gradlew diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index 7f0a38b4..19a93e9e 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -19,9 +19,9 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: 'microsoft' java-version: '17' - name: Grant execute permission for gradlew -- cgit