Build script cleanup (#150)v0.1.4-pre23v0.1.4-pre20

* always do 'config' to avoid user input problems in CI
* always bundle on validate release, remove separate build release
* bump vcpkg cache

2 files changed, 67 insertions, 51 deletions

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 329dbc017..a6412fd73 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -33,7 +33,13 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}\.vcpkg\installed
-        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v5
+        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v8
+
+    - name: Config
+      run: |
+        xmake config -v -y -m release
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
     - name: Bundle
       run: |
@@ -79,7 +85,13 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}/.vcpkg/installed
-        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v5
+        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v8
+
+    - name: Config
+      run: |
+        xmake config -v -y -m release
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
     - name: Bundle
       run: |
@@ -125,7 +137,13 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}/.vcpkg/installed
-        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v5
+        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v8
+
+    - name: Config
+      run: |
+        xmake config -v -y -m release
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
     - name: Bundle
       run: |
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index bfabecd8b..ce51635c4 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -12,6 +12,7 @@ on:
       paths-ignore:
       - 'VERSION.txt'
       - 'CHANGELOG.md'
+      - '.github/workflows/create_release.yml'
 
 jobs:
   cancel-old-build:
@@ -77,10 +78,23 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}\.vcpkg\installed
-        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5
+        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v8
+
+    - name: Config
+      run: |
+        xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+    - name: Build & Test
+      if: ${{ matrix.config == 'debug' }}
+      run: |
+        xmake test -v -y
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
     - name: Bundle
-      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
+      if: ${{ matrix.config == 'release' }}
       run: |
         xmake bundle -v -y
       env:
@@ -93,18 +107,6 @@ jobs:
         name: zenserver-win64
         path: build/zenserver-win64.zip
 
-    - name: Config
-      run: |
-        xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
-      env:
-        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-
-    - name: Build & Test
-      run: |
-        xmake test -v -y
-      env:
-        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-
   linux-build:
     needs: cancel-old-build
     name: Build & Test Linux
@@ -147,10 +149,23 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}/.vcpkg/installed
-        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5
+        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v8
+
+    - name: Config
+      run: |
+        xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+    - name: Build & Test
+      if: ${{ matrix.config == 'debug' }}
+      run: |
+        xmake test -v -y
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
     - name: Bundle
-      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
+      if: ${{ matrix.config == 'release' }}
       run: |
         xmake bundle -v -y
       env:
@@ -163,18 +178,6 @@ jobs:
         name: zenserver-linux
         path: build/zenserver-linux.zip
 
-    - name: Config
-      run: |
-        xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
-      env:
-        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-
-    - name: Build & Test
-      run: |
-        xmake test -v -y
-      env:
-        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-
   macos-build:
     needs: cancel-old-build
     name: Build & Test MacOS
@@ -194,12 +197,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-#    - name: Set up GCC 11
-#      uses: egor-tensin/setup-gcc@v1
-#      with:
-#        version: 11
-#        platform: x64
-
     - name: Setup xmake
       uses: xmake-io/github-action-setup-xmake@v1
       with:
@@ -217,10 +214,23 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}/.vcpkg/installed
-        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5
+        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v8
+
+    - name: Config
+      run: |
+        xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+    - name: Build & Test
+      if: ${{ matrix.config == 'debug' }}
+      run: |
+        xmake test -v -y
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
     - name: Bundle
-      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
+      if: ${{ matrix.config == 'release' }}
       run: |
         xmake bundle -v -y
       env:
@@ -232,15 +242,3 @@ jobs:
       with:
         name: zenserver-macos
         path: build/zenserver-macos.zip
-
-    - name: Config
-      run: |
-        xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
-      env:
-        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-
-    - name: Build & Test
-      run: |
-        xmake test -v -y
-      env:
-        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg