From a319adaed2a98f7c12ff82ddb0b7cae65e1c3ee7 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 22 Dec 2024 22:39:50 +0500 Subject: [PATCH 1/2] Update pull.yml --- .github/workflows/pull.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 986924110..913b787aa 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -8,10 +8,6 @@ on: branches: - main -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: true - env: RELEASE_TYPE: "alpha" MINECRAFT_VERSION: "1.20.1" From 33286316cb31b50ba052c9240073775ec2df27b6 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 22 Dec 2024 22:42:36 +0500 Subject: [PATCH 2/2] workflows --- .github/workflows/build.yml | 8 +++++--- .github/workflows/pull.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83a03240f..3fee8b373 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,6 +167,10 @@ jobs: - name: 📝 Generate Github Summary uses: WcAServices/markdown-template-action@v1.1.0 with: + variables: >- + if [ -n "${{ steps.read_diff.outputs.diff != '' }}" ]; then + DIFF="${{ steps.read_diff.outputs.diff }}" + fi template: | 📃 **Name**: ${{ steps.project_name.outputs.value }} 📃 **Release**: ${{ steps.project_version.outputs.value }} @@ -174,9 +178,7 @@ jobs: 📃 **Game Version**: ${{ env.MINECRAFT_VERSION }} ${{ steps.changelog.outputs.description }} - if [ -n "${{ steps.read_diff.outputs.diff != '' }}" ]; then - ${{ steps.read_diff.outputs.diff }} - fi + $DIFF build-modpack: diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 913b787aa..ea38bcd39 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -166,6 +166,10 @@ jobs: - name: 📝 Generate Github Summary uses: WcAServices/markdown-template-action@v1.1.0 with: + variables: >- + if [ -n "${{ steps.read_diff.outputs.diff != '' }}" ]; then + DIFF="${{ steps.read_diff.outputs.diff }}" + fi template: | 📃 **Name**: ${{ steps.project_name.outputs.value }} 📃 **Release**: ${{ steps.project_version.outputs.value }} @@ -173,7 +177,5 @@ jobs: 📃 **Game Version**: ${{ env.MINECRAFT_VERSION }} ${{ steps.changelog.outputs.description }} - if [ -n "${{ steps.read_diff.outputs.diff != '' }}" ]; then - ${{ steps.read_diff.outputs.diff }} - fi + $DIFF \ No newline at end of file