Skip to content

Commit

Permalink
Merge branch 'ms5' into 'beta'
Browse files Browse the repository at this point in the history
Ms5

See merge request Griefed/ServerPackCreator!553
  • Loading branch information
Griefed committed Dec 2, 2023
2 parents 0cd4afe + 3b9a3e0 commit cc48dad
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ jobs:
run: |
if [[ $(wc -c description.txt | awk '{print $1}') -ge 8000 ]]; then
truncate -s 8000 description.txt
printf "\n\n............\n\nRelease notes truncated. For more details, see the [CHANGELOG](https://github.com/Griefed/ServerPackCreator/blob/main/CHANGELOG.md).\n\n" >> description.txt
printf "\n\n............\n\nRelease notes truncated. For more details, see the [CHANGELOG](https://github.com/Griefed/ServerPackCreator/blob/${{ needs.preparations.outputs.version }}/CHANGELOG.md).\n\n" >> description.txt
fi
- name: Append Release Info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ jobs:
run: |
if [[ $(wc -c description.txt | awk '{print $1}') -ge 10000 ]]; then
truncate -s 10000 description.txt
printf "\n\n............\n\nRelease notes truncated. For more details, see the [CHANGELOG](https://github.com/Griefed/ServerPackCreator/blob/main/CHANGELOG.md).\n\n" >> description.txt
printf "\n\n............\n\nRelease notes truncated. For more details, see the [CHANGELOG](https://github.com/Griefed/ServerPackCreator/blob/${{ needs.preparations.outputs.version }}/CHANGELOG.md).\n\n" >> description.txt
fi
- name: Append Release Info
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ on:

jobs:
jar:
runs-on: ubuntu-latest
strategy:
matrix:
# and run on both Linux and Windows
os: [ ubuntu-latest, windows-latest, macos-latest ]
runs-on: ${{ matrix.os }}
steps:

- uses: actions/[email protected]
Expand All @@ -25,6 +29,7 @@ jobs:
cache: 'gradle'

- name: Grant execute permission for gradlew
if: ${{ runner.os != 'Windows' }}
run: chmod +x gradlew

- uses: gradle/[email protected]
Expand Down

0 comments on commit cc48dad

Please sign in to comment.