tes 4.0,4.6,4.7

Author: Yuuki

.github/workflows/yuukips.yml

@@ -1,7 +1,7 @@
-name: YuukiPS Alpine (4.0) (19) (Stable)
+name: YuukiPS Alpine (4.0) (19)
 on:
   push:
-    paths: # TES3
+    paths:
       - "gs/os-loc-alpine-gc"
       - "gs/ver_GSServer-GC-4.0"
       - "gs/run.sh"
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Sync DockerGS
+      - name: Sync DockerGI
         uses: actions/checkout@v3
       - name: Sync YuukiPS
         uses: actions/checkout@v3

.github/workflows/yuukipsv1.yml

@@ -0,0 +1,49 @@
+name: YuukiPS Alpine (4.6) (22)
+on:
+  push:
+    paths:
+      - "gs/os-loc-alpine-gc"
+      - "gs/ver_GSServer-GC-4.6-brokebroke"
+      - "gs/run.sh"
+      - "gs/entrypoint_gc.sh"
+      - ".github/workflows/yuukipsv2.yml"
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sync DockerGI
+        uses: actions/checkout@v3
+      - name: Sync YuukiPS
+        uses: actions/checkout@v3
+        with:
+          repository: YuukiPS/GSServer-GC
+          ref: "4.6-brokebroke"
+          token: ${{ secrets.HUB_TOKEN }}
+          path: gs/GSServer-GC
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: "17"
+          cache: "gradle"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          registry: registry.gitlab.com
+          username: ${{secrets.DOCKER_USER_PRIVATE_GITLAB}}
+          password: ${{secrets.DOCKER_PASSWORD_PRIVATE_GITLAB}}
+      - name: Build Local Jar
+        run: cd gs && chmod +x run.sh && sh run.sh alpine build 22 docker_action pv
+      - name: Build Image Docker and Push
+        uses: docker/build-push-action@v3
+        with:
+          context: ./gs
+          file: ./gs/os-loc-alpine-gc
+          push: true
+          tags: |
+            ${{ env.ver1 }}
+            ${{ env.ver2 }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/yuukipsv2.yml

@@ -1,23 +1,23 @@
-name: YuukiPS Alpine (4.6) (22) (Broke Broke)
+name: YuukiPS Alpine (4.7) (23)
 on:
   push:
     paths:
       - "gs/os-loc-alpine-gc"
-      - "gs/ver_GSServer-GC-4.6-brokebroke"
+      - "gs/ver_GSServer-GC-4.7"
       - "gs/run.sh"
       - "gs/entrypoint_gc.sh"
       - ".github/workflows/yuukipsv2.yml"
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Sync DockerGS
+      - name: Sync DockerGI
         uses: actions/checkout@v3
       - name: Sync YuukiPS
         uses: actions/checkout@v3
         with:
           repository: YuukiPS/GSServer-GC
-          ref: "4.6-brokebroke"
+          ref: "4.7"
           token: ${{ secrets.HUB_TOKEN }}
           path: gs/GSServer-GC
       - name: Setup Java
@@ -35,7 +35,7 @@ jobs:
           username: ${{secrets.DOCKER_USER_PRIVATE_GITLAB}}
           password: ${{secrets.DOCKER_PASSWORD_PRIVATE_GITLAB}}
       - name: Build Local Jar
-        run: cd gs && chmod +x run.sh && sh run.sh alpine build 22 docker_action pv
+        run: cd gs && chmod +x run.sh && sh run.sh alpine build 23 docker_action pv
       - name: Build Image Docker and Push
         uses: docker/build-push-action@v3
         with:

gs/entrypoint_gc.sh

@@ -164,6 +164,9 @@ elif echo "$version" | grep -F -w "4.5"; then
 elif echo "$version" | grep -F -w "4.6"; then
   version_res="4.6"
   # resmd5=""
+elif echo "$version" | grep -F -w "4.7"; then
+  version_res="4.7"
+  # resmd5=""
 fi
 
 echo "Runs with OS $OSVS"

gs/run.sh

@@ -61,6 +61,13 @@ if [ "$2" != "version_action" ]; then
     useShortProject="yuukips"
     useProject="GSServer-GC"
     userHub="registry.gitlab.com/yuukips"
+  elif [ "$versioncontrol" = "23" ]; then # for private
+    mainProject="yuukigc"
+    useBranchesProject="4.7"
+    useBranchesRes="4.7"
+    useShortProject="yuukips"
+    useProject="GSServer-GC"
+    userHub="registry.gitlab.com/yuukips"
   fi
 
 fi
@@ -86,6 +93,10 @@ foldertodo="todo_$useFolderProject"
 folderworkdata="$folderwork/data"
 filejson="$folderwork/config.json"
 filejson_res="$foldertodo/config.backup"
+
+filejson_scene3_backup="$foldertodo/cache/scene3_grid.json" # BIG DATA
+filejson_scene3_work="$folderwork/cache/scene3_grid.json"
+
 filecache="$folderwork/cache/TextMapCache.bin"
 
 # Check OS
@@ -234,6 +245,12 @@ if [ "$metode" = "start" ]; then
       cp -rTf $filejson_res $filejson
     fi
 
+    if test -f "$filejson_scene3_backup"; then
+      echo "Found file scene 3 backup"
+      mkdir -p "$(dirname "$filejson_scene3_work")"
+      cp -rTf $filejson_scene3_backup $filejson_scene3_work
+    fi
+
     cd $folderwork
 
     if [ "$4" = "debug" ]; then

gs/ver_GSServer-GC-4.6-brokebroke

@@ -1 +1 @@
-3dc21b2
+529f5cf

gs/ver_GSServer-GC-4.7

@@ -0,0 +1 @@
+b0345d1