Skip to content

Commit 6c167bd

Browse files
author
Yuuki
committed
Testing 2.5 (50da8dd)
1 parent dc61f50 commit 6c167bd

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
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-2.4.0"
6+
- "sr/ver_LunarCore-Private-2.5.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: "2.4.0"
20+
ref: "2.5.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 7 docker_action
38+
run: cd sr && chmod +x run.sh && sh run.sh alpine build 8 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 7 <br>
4-
./run.sh local run 7 <br>
3+
./run.sh local build 8 <br>
4+
./run.sh local run 8 <br>

sr/entrypoint_lc.sh

+5-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="2.3.0-LC"
134+
version_res="2.5.0-LC"
135135
resmd5="e7754c155a4668606fc3695aced65717" # TODO: auto update md5 if res update
136136

137137
# Switch RS
@@ -146,6 +146,10 @@ elif echo "$version" | grep -F -w "2.1.0"; then
146146
elif echo "$version" | grep -F -w "2.2.0"; then
147147
version_res="2.2.0-LC"
148148
elif echo "$version" | grep -F -w "2.3.0"; then
149+
version_res="2.3.0-LC"
150+
elif echo "$version" | grep -F -w "2.4.0"; then
151+
version_res="2.4.0-LC"
152+
elif echo "$version" | grep -F -w "2.5.0"; then
149153
echo "use last"
150154
fi
151155

sr/run.sh

+5-2
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="2.4.0"
20-
useBranchesRes="2.4.0-LC"
19+
useBranchesProject="2.5.0"
20+
useBranchesRes="2.5.0-LC"
2121

2222
# Version Control by User, skip if version_action
2323
if [ "$2" != "version_action" ]; then
@@ -44,6 +44,9 @@ if [ "$2" != "version_action" ]; then
4444
useBranchesProject="2.3.0"
4545
useBranchesRes="2.3.0-LC"
4646
elif [ "$versioncontrol" = "7" ]; then # 2.4.0 (private)
47+
useBranchesProject="2.4.0"
48+
useBranchesRes="2.4.0-LC"
49+
elif [ "$versioncontrol" = "8" ]; then # 2.5.0 (private)
4750
echo "main project"
4851
fi
4952

sr/ver_LunarCore-Private-2.5.0

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
50da8dd

0 commit comments

Comments
 (0)