aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-05-26 00:07:46 +0200
committerDan Engelbrecht <[email protected]>2022-05-26 00:07:46 +0200
commit42817775328368030f55b9ffe8baef1900fab122 (patch)
tree5da07cf5ef60d8f046874cdf9013b17a4fec6659
parentfix brackets (diff)
downloadzen-1.0.1.9.tar.xz
zen-1.0.1.9.zip
re-enable windows bundle on create releasev1.0.1.9
-rw-r--r--.github/workflows/create_release.yml100
1 files changed, 49 insertions, 51 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 9ba83aeda..317c8e322 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -7,47 +7,47 @@ on:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
jobs:
-# bundle-windows:
-#
-# runs-on: [self-hosted, windows, x64]
-#
-# env:
-# VCPKG_VERSION: 2022.03.10
-#
-# steps:
-# - uses: actions/checkout@v2
-#
-# - 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.bat
-# .\vcpkg.exe integrate install
-# 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: zenserver-win64
-# uses: actions/upload-artifact@v3
-# with:
-# name: zenserver-win64
-# path: build/zenserver-win64.zip
+ bundle-windows:
+
+ runs-on: [self-hosted, windows, x64]
+
+ env:
+ VCPKG_VERSION: 2022.03.10
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - 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.bat
+ .\vcpkg.exe integrate install
+ 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-win64
+ uses: actions/upload-artifact@v3
+ with:
+ name: zenserver-win64
+ path: build/zenserver-win64.zip
bundle-linux:
runs-on: [self-hosted, linux, x64]
@@ -89,7 +89,7 @@ jobs:
env:
VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
- - name: upload zenserver-linux
+ - name: Upload zenserver-linux
uses: actions/upload-artifact@v3
with:
name: zenserver-linux
@@ -97,8 +97,7 @@ jobs:
create-release:
runs-on: ubuntu-latest
-# needs: [bundle-linux, bundle-windows]
- needs: [bundle-linux]
+ needs: [bundle-linux, bundle-windows]
steps:
- uses: actions/checkout@v2
@@ -108,11 +107,11 @@ jobs:
name: zenserver-linux
path: linux
-# - name: Download Windows artifacts
-# uses: actions/download-artifact@v1
-# with:
-# name: zenserver-win64
-# path: win64
+ - name: Download Windows artifacts
+ uses: actions/download-artifact@v1
+ with:
+ name: zenserver-win64
+ path: win64
- name: Check prerelease
id: get-prerelease
@@ -141,5 +140,4 @@ jobs:
prerelease: ${{steps.get-prerelease.outputs.value}}
files: |
linux/zenserver-linux.zip
-# win64/zenserver-win64.zip
-
+ win64/zenserver-win64.zip