re-enable MacOS build (#144)v0.1.4-pre19v0.1.4-pre14v0.1.4-pre13v0.1.4-pre11

* re-enable MacOS build
* bump vcpkg version

2 files changed, 121 insertions, 121 deletions

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 64110dcb8..329dbc017 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -93,56 +93,56 @@ jobs:
         name: zenserver-linux
         path: build/zenserver-linux.zip
  
-#  bundle-macos:
-#    runs-on: [self-hosted, macos, x64]
-#    timeout-minutes: 15
-#    env:
-#      VCPKG_VERSION: 2022.08.15
-#
-#    steps:
-#    - 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:
-#        xmake-version: 2.6.4
-#
-#    - name: Installing vcpkg
-#      run: |
-#        git clone -b ${{env.VCPKG_VERSION}} --single-branch https://github.com/Microsoft/vcpkg.git .vcpkg
-#        cd .vcpkg
-#        ./bootstrap-vcpkg.sh
-#        cd ..
-#
-#    - name: Cache vcpkg
-#      uses: actions/cache@v2
-#      with:
-#        path: |
-#          ${{ github.workspace }}/.vcpkg/installed
-#        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v5
-#
-#    - name: Bundle
-#      run: |
-#        xmake bundle -v -y
-#      env:
-#        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-#
-#    - name: Upload zenserver-macos
-#      uses: actions/upload-artifact@v3
+  bundle-macos:
+    runs-on: [self-hosted, macos, x64]
+    timeout-minutes: 15
+    env:
+      VCPKG_VERSION: 2022.08.15
+
+    steps:
+    - uses: actions/checkout@v2
+
+#    - name: Set up GCC 11
+#      uses: egor-tensin/setup-gcc@v1
 #      with:
-#        name: zenserver-macos
-#        path: build/zenserver-macos.zip
+#        version: 11
+#        platform: x64
+
+    - name: Setup xmake
+      uses: xmake-io/github-action-setup-xmake@v1
+      with:
+        xmake-version: 2.6.4
+
+    - name: Installing vcpkg
+      run: |
+        git clone -b ${{env.VCPKG_VERSION}} --single-branch https://github.com/Microsoft/vcpkg.git .vcpkg
+        cd .vcpkg
+        ./bootstrap-vcpkg.sh
+        cd ..
+
+    - name: Cache vcpkg
+      uses: actions/cache@v2
+      with:
+        path: |
+          ${{ github.workspace }}/.vcpkg/installed
+        key: ${{ runner.os }}-release-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-x64-v5
+
+    - name: Bundle
+      run: |
+        xmake bundle -v -y
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+    - name: Upload zenserver-macos
+      uses: actions/upload-artifact@v3
+      with:
+        name: zenserver-macos
+        path: build/zenserver-macos.zip
 
   create-release:
     runs-on: [self-hosted, linux, x64]
     timeout-minutes: 5
-    needs: [bundle-linux, bundle-windows] #, bundle-macos]
+    needs: [bundle-linux, bundle-macos, bundle-windows]
 
     steps:
     - uses: actions/checkout@v2
@@ -153,11 +153,11 @@ jobs:
         name: zenserver-linux
         path: linux
 
-#    - name: Download MacOS artifacts
-#      uses: actions/download-artifact@v1
-#      with:
-#        name: zenserver-macos
-#        path: macos
+    - name: Download MacOS artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: zenserver-macos
+        path: macos
 
     - name: Download Windows artifacts
       uses: actions/download-artifact@v1
@@ -203,4 +203,4 @@ jobs:
         files: |
           linux/zenserver-linux.zip
           win64/zenserver-win64.zip
-#          macos/zenserver-macos.zip
+          macos/zenserver-macos.zip
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 1a724edfd..bfabecd8b 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -65,7 +65,7 @@ jobs:
         xmake-version: 2.6.4
 
     - name: Installing vcpkg
-      run: |
+      run: | #        Remove-Item -Recurse .vcpkg
         git clone -b ${{env.VCPKG_VERSION}} --single-branch https://github.com/Microsoft/vcpkg.git .vcpkg
         cd .vcpkg
         .\bootstrap-vcpkg.bat
@@ -136,7 +136,7 @@ jobs:
         xmake-version: 2.6.4
 
     - name: Installing vcpkg
-      run: |
+      run: | #        rm -rf .vcpkg
         git clone -b ${{env.VCPKG_VERSION}} --single-branch https://github.com/Microsoft/vcpkg.git .vcpkg
         cd .vcpkg
         ./bootstrap-vcpkg.sh
@@ -175,72 +175,72 @@ jobs:
       env:
         VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
-#  macos-build:
-#    needs: cancel-old-build
-#    name: Build & Test MacOS
-#    runs-on: [self-hosted, macos, x64]
-#    timeout-minutes: 15
-#    strategy:
-#          matrix:
-#            config:
-#              - 'debug'
-#              - 'release'
-#            arch:
-#              - 'x86_64'
-#    env:
-#      VCPKG_VERSION: 2022.08.15
-#
-#    steps:
-#    - 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:
-#        xmake-version: 2.6.4
-#
-#    - name: Installing vcpkg
-#      run: |
-#        git clone -b ${{env.VCPKG_VERSION}} --single-branch https://github.com/Microsoft/vcpkg.git .vcpkg
-#        cd .vcpkg
-#        ./bootstrap-vcpkg.sh
-#        cd ..
-#
-#    - name: Cache vcpkg
-#      uses: actions/cache@v2
-#      with:
-#        path: |
-#          ${{ github.workspace }}/.vcpkg/installed
-#        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5
-#
-#    - name: Bundle
-#      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
-#      run: |
-#        xmake bundle -v -y
-#      env:
-#        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-#
-#    - name: Upload zenserver-macos
-#      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
-#      uses: actions/upload-artifact@v3
+  macos-build:
+    needs: cancel-old-build
+    name: Build & Test MacOS
+    runs-on: [self-hosted, macos, x64]
+    timeout-minutes: 15
+    strategy:
+          matrix:
+            config:
+              - 'debug'
+              - 'release'
+            arch:
+              - 'x86_64'
+    env:
+      VCPKG_VERSION: 2022.08.15
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+#    - name: Set up GCC 11
+#      uses: egor-tensin/setup-gcc@v1
 #      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
+#        version: 11
+#        platform: x64
+
+    - name: Setup xmake
+      uses: xmake-io/github-action-setup-xmake@v1
+      with:
+        xmake-version: 2.6.4
+
+    - name: Installing vcpkg
+      run: | #        rm -rf .vcpkg
+        git clone -b ${{env.VCPKG_VERSION}} --single-branch https://github.com/Microsoft/vcpkg.git .vcpkg
+        cd .vcpkg
+        ./bootstrap-vcpkg.sh
+        cd ..
+
+    - name: Cache vcpkg
+      uses: actions/cache@v2
+      with:
+        path: |
+          ${{ github.workspace }}/.vcpkg/installed
+        key: ${{ runner.os }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5
+
+    - name: Bundle
+      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
+      run: |
+        xmake bundle -v -y
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+    - name: Upload zenserver-macos
+      if: ${{ github.ref_name == 'main' && matrix.config == 'release' }}
+      uses: actions/upload-artifact@v3
+      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