Skip to content

Commit 002ff63

Browse files
committed
Merge 1.19.4 into 1.20
2 parents 79c4b1c + 8266947 commit 002ff63

File tree

4 files changed

+75
-1
lines changed

4 files changed

+75
-1
lines changed

.github/workflows/release.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: release-artifacts
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- uses: actions/setup-java@v3
16+
with:
17+
distribution: 'temurin'
18+
java-version: '17'
19+
- name: Grant execute permission for gradlew
20+
run: chmod +x gradlew
21+
- name: Build and publish mod to CurseForge & Modrinth
22+
run: ./gradlew forge:publishToModSites fabric:publishToModSites
23+
env:
24+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
25+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
26+
- name: Upload assets to GitHub
27+
uses: AButler/[email protected]
28+
with:
29+
files: 'bin/*'
30+
repo-token: ${{ secrets.GITHUB_TOKEN }}

fabric/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
"minecraft": ">=1.16.2"
3838
},
3939
"breaks": {
40-
"dashloader": "*"
40+
"dashloader": "<5.0.0-beta.1"
4141
}
4242
}

scripts/propagate.sh

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/bash
2+
set -e
3+
4+
WORK_DIR=`mktemp -d`
5+
6+
# deletes the temp directory
7+
function cleanup {
8+
cd $HOME
9+
rm -rf "$WORK_DIR"
10+
}
11+
12+
trap cleanup EXIT
13+
14+
# clone ModernFix repo
15+
16+
echo "downloading temporary modernfix..."
17+
cd $WORK_DIR
18+
git clone https://github.com/embeddedt/ModernFix mfix &>/dev/null
19+
cd mfix
20+
21+
# gather version list
22+
readarray -t all_versions < <(git ls-remote --heads origin | awk '{print $2}' | sed 's:.*/::' | sort -V)
23+
echo "found versions: ${all_versions[@]}"
24+
25+
# checkout base version
26+
git checkout -b propagations/${all_versions[0]} origin/${all_versions[0]} &>/dev/null
27+
28+
our_version=${all_versions[0]}
29+
restore_version=$our_version
30+
31+
for version in "${all_versions[@]}"; do
32+
if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
33+
echo -n "merging $our_version into ${version}... "
34+
git checkout -b propagations/$version origin/$version &>/dev/null
35+
if git merge -m "Merge $our_version into $version" propagations/$our_version >/dev/null; then
36+
echo "done"
37+
git push -u origin propagations/$version:$version &>/dev/null
38+
else
39+
echo "failed, this merge must be done manually"
40+
exit 1
41+
fi
42+
our_version=$version
43+
fi
44+
done
File renamed without changes.

0 commit comments

Comments
 (0)