aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-04-12 10:08:39 +0200
committerDan Engelbrecht <[email protected]>2022-04-12 10:08:39 +0200
commit255e1971134f4f19ec5908c053ccc4702227903b (patch)
treed84bbb38b7a89a12f4e496c116dfbe0a9af59072
parentBe more strict with m_TotalSize atomic operations (diff)
downloadzen-255e1971134f4f19ec5908c053ccc4702227903b.tar.xz
zen-255e1971134f4f19ec5908c053ccc4702227903b.zip
make linux tests inline
-rw-r--r--.github/workflows/on_prem_windows.yml65
1 files changed, 2 insertions, 63 deletions
diff --git a/.github/workflows/on_prem_windows.yml b/.github/workflows/on_prem_windows.yml
index d109c67b4..1c1bfe0da 100644
--- a/.github/workflows/on_prem_windows.yml
+++ b/.github/workflows/on_prem_windows.yml
@@ -127,69 +127,8 @@ jobs:
env:
VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
- - name: Build
+ - name: Build & Test
run: |
- xmake build -v -y
+ xmake test -v -y
env:
VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
-
- - name: Create Archive
- run: |
- cd ./build/linux/${{ matrix.arch }}/${{ matrix.config }}
- zip -r ../../../../linux-${{ matrix.arch }}-${{ matrix.config }}.zip *
- cd ../../../..
-
- - name: Upload
- uses: actions/upload-artifact@v3
- with:
- name: linux-${{ matrix.arch }}-${{ matrix.config }}
- path: ./linux-${{ matrix.arch }}-${{ matrix.config }}.zip
- if-no-files-found: error
-
- linux-test:
- name: Test Linux
- runs-on: [self-hosted, linux, x64]
- needs: linux-build
- strategy:
- matrix:
- config:
- - 'debug'
- arch:
- - 'x86_64'
- test:
- - zencore-test
- - zenserver
- - zenserver-test
- - zenstore-test
- include:
- - test: "zenserver"
- args: "test"
- - test: "zenserver-test"
- args: "--test-case-exclude=websocket.basic"
-
- steps:
- - if: ${{ matrix.test == 'zenserver-test' }}
- uses: actions/checkout@v2
-
- # Temporary workaround since we need libstdc++.so.6
- - name: Set up GCC 11
- uses: egor-tensin/setup-gcc@v1
- with:
- version: 11
- platform: x64
-
- - name: Download
- uses: actions/download-artifact@v3
- with:
- name: linux-${{ matrix.arch }}-${{ matrix.config }}
-
- - name: Extract Archive
- run: |
- mkdir -p ./build/linux/${{ matrix.arch }}/${{ matrix.config }}
- cd ./build/linux/${{ matrix.arch }}/${{ matrix.config }}
- 7z x ../../../../linux-${{ matrix.arch }}-${{ matrix.config }}.zip -y
- cd ../../../..
-
- - name: Test ${{matrix.test}}
- run: |
- ./build/linux/${{ matrix.arch }}/${{ matrix.config }}/${{ matrix.test }} ${{ matrix.args }}