aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-05-25 20:06:35 +0200
committerDan Engelbrecht <[email protected]>2022-05-25 20:06:35 +0200
commitad97285ae108d3f7657a43e82e15d4b4dc08e0f1 (patch)
treece6745c163dfcdc6fa5a10a2220ec3662fba7580
parentcleanup (diff)
downloadzen-ad97285ae108d3f7657a43e82e15d4b4dc08e0f1.tar.xz
zen-ad97285ae108d3f7657a43e82e15d4b4dc08e0f1.zip
bundle if we are on main branch
-rw-r--r--.github/workflows/self_host_build.yml36
1 files changed, 32 insertions, 4 deletions
diff --git a/.github/workflows/self_host_build.yml b/.github/workflows/self_host_build.yml
index 8bb57a4b4..e90ab8a6d 100644
--- a/.github/workflows/self_host_build.yml
+++ b/.github/workflows/self_host_build.yml
@@ -1,8 +1,8 @@
-name: Validate Build
+name: Validate
on:
pull_request:
- types: [opened, reopened, synchronize, reopened]
+ types: [opened, reopened, synchronize]
branches: [ main ]
jobs:
@@ -21,7 +21,7 @@ jobs:
exclude-regex: (.*thirdparty.*)
windows-build:
- name: Build Windows
+ name: Build & Test Windows
runs-on: [self-hosted, windows, x64]
strategy:
matrix:
@@ -56,6 +56,20 @@ jobs:
${{ 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')
+ run: |
+ xmake bundle -v -y
+ env:
+ VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+ - name: upload zenserver-linux
+ if: ${{ github.ref_name == 'main')
+ uses: actions/upload-artifact@v3
+ with:
+ name: zenserver-linux
+ path: build/zenserver-linux.zip
+
- name: Config
run: |
xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}
@@ -69,7 +83,7 @@ jobs:
VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
linux-build:
- name: Build Linux
+ name: Build & Test Linux
runs-on: [self-hosted, linux, x64]
strategy:
matrix:
@@ -109,6 +123,20 @@ jobs:
${{ 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')
+ run: |
+ xmake bundle -v -y
+ env:
+ VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
+
+ - name: upload zenserver-win64
+ if: ${{ github.ref_name == 'main')
+ uses: actions/upload-artifact@v3
+ with:
+ name: zenserver-win64
+ path: build/zenserver-win64.zip
+
- name: Config
run: |
xmake config -v -y -m ${{ matrix.config }} --arch=${{ matrix.arch }}