Merge branch 'main' into patch-2
This commit is contained in:
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -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:
|
||||
|
||||
12
.github/workflows/pull.yml
vendored
12
.github/workflows/pull.yml
vendored
@@ -8,10 +8,6 @@ on:
|
||||
branches:
|
||||
- main
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
RELEASE_TYPE: "alpha"
|
||||
MINECRAFT_VERSION: "1.20.1"
|
||||
@@ -170,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 }}
|
||||
@@ -177,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
|
||||
|
||||
Reference in New Issue
Block a user