Skip to content

Commit daa2c8b

Browse files
author
Yuuki
committed
Update: e29280a (testing)
1 parent bc8419a commit daa2c8b

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.github/workflows/yuukips.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
paths:
55
- "sr/os-loc-alpine-lc"
6-
- "sr/ver_LunarCore-Private-3.0.0"
6+
- "sr/ver_LunarCore-Private-3.1.0"
77
- "sr/run.sh"
88
- "sr/entrypoint_lc.sh"
99
- ".github/workflows/yuukips.yml"
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v3
1818
with:
1919
repository: YuukiPS/LunarCore-Private
20-
ref: "3.0.0"
20+
ref: "3.1.0"
2121
token: ${{ secrets.HUB_TOKEN }} # tes
2222
path: sr/LunarCore-Private
2323
- name: Setup Java
@@ -35,7 +35,7 @@ jobs:
3535
username: ${{secrets.DOCKER_USER_PRIVATE_GITLAB}}
3636
password: ${{secrets.DOCKER_PASSWORD_PRIVATE_GITLAB}}
3737
- name: Build Local Jar
38-
run: cd sr && chmod +x run.sh && sh run.sh alpine build 11 docker_action
38+
run: cd sr && chmod +x run.sh && sh run.sh alpine build 12 docker_action
3939
- name: Build Image Docker and Push
4040
uses: docker/build-push-action@v3
4141
with:

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DockerSR
22
DockerSR is a container that run LunarCore with just a single command.<br>
3-
./run.sh local build 11 <br>
4-
./run.sh local run 11 <br>
3+
./run.sh local build 12<br>
4+
./run.sh local run 12 <br>

sr/entrypoint_lc.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ cd $folder_sr
131131
OSVS=$(. /etc/os-release && printf '%s\n' "$NAME")
132132
SUB="Alpine"
133133
version=$(cat ver)
134-
version_res="3.0.0-LC"
134+
version_res="3.1.0"
135135
resmd5="e7754c155a4668606fc3695aced65717" # TODO: auto update md5 if res update
136136

137137
# Switch RS
@@ -156,6 +156,8 @@ elif echo "$version" | grep -F -w "2.6.0"; then
156156
elif echo "$version" | grep -F -w "2.7.0"; then
157157
version_res="2.7.0-LC"
158158
elif echo "$version" | grep -F -w "3.0.0"; then
159+
version_res="3.0.0"
160+
elif echo "$version" | grep -F -w "3.1.0"; then
159161
echo "use last"
160162
fi
161163

sr/run.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ useMetode="build"
1616
useResFolder="SR_Resources"
1717
useProject="LunarCore-Private"
1818
useShortProject="dockersr" # name in commet
19-
useBranchesProject="3.0.0"
20-
useBranchesRes="3.0.0-LC"
19+
useBranchesProject="3.1.0"
20+
useBranchesRes="3.1.0"
2121

2222
# Version Control by User, skip if version_action
2323
if [ "$2" != "version_action" ]; then
@@ -56,6 +56,9 @@ if [ "$2" != "version_action" ]; then
5656
useBranchesProject="2.7.0"
5757
useBranchesRes="2.7.0-LC"
5858
elif [ "$versioncontrol" = "11" ]; then # 3.0.0 (private)
59+
useBranchesProject="3.0.0"
60+
useBranchesRes="3.0.0"
61+
elif [ "$versioncontrol" = "12" ]; then # 3.1.0 (private)
5962
echo "main project"
6063
fi
6164

@@ -72,8 +75,8 @@ fi
7275
build_game="$useProject/.gradle $useProject/bin $useProject/build $useProject/src/generated"
7376
# $useProject/src/generated
7477
# $useProject/logs $useProject/resources $useProject/config.json $useProject/plugins
75-
echo "tes"
76-
ls $useProject/src/generated/main/emu/lunarcore/proto
78+
#echo "tes"
79+
#s $useProject/src/generated/main/emu/lunarcore/proto
7780

7881
# Version
7982
version_pjhash="unknown"

sr/ver_LunarCore-Private-3.1.0

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e29280a

0 commit comments

Comments
 (0)