From a5c70af49a66c0a708ba612a29e3cd4639e1c613 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Tue, 24 May 2022 23:33:02 +0200 Subject: run clang format on single instance, don't wait for clang-format --- .github/workflows/self_host_build.yml | 75 +++++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 17 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/self_host_build.yml b/.github/workflows/self_host_build.yml index 3864151ce..eb378e5f6 100644 --- a/.github/workflows/self_host_build.yml +++ b/.github/workflows/self_host_build.yml @@ -9,30 +9,72 @@ jobs: clang-format: name: Check clang-format runs-on: [self-hosted, linux, x64] - strategy: - matrix: - path: - - 'zen' - - 'zencore' - - 'zencore-test' - - 'zenhttp' - - 'zenserver-test' - - 'zenstore' - - 'zenstore-test' - - 'zentest-appstub' - - 'zenutil' - - 'zenserver' + steps: - uses: actions/checkout@v2 - - name: clang-format ${{ matrix.path }} + + - name: clang-format 'zen' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zen' + + - name: clang-format 'zencore' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zencore' + + - name: clang-format 'zencore-test' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zencore-test' + + - name: clang-format 'zenhttp' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zenhttp' + + - name: clang-format 'zenserver-test' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zenserver-test' + + - name: clang-format 'zenstore' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zenstore' + + - name: clang-format 'zenstore-test' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zenstore-test' + + - name: clang-format 'zentest-appstub' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zentest-appstub' + + - name: clang-format 'zenutil' + uses: jidicula/clang-format-action@v4.6.2 + with: + clang-format-version: '13' + check-path: 'zenutil' + + - name: clang-format 'zenserver' uses: jidicula/clang-format-action@v4.6.2 with: clang-format-version: '13' - check-path: ${{ matrix.path }} + check-path: 'zenserver' windows-build: name: Build Windows - needs: clang-format runs-on: [self-hosted, windows, x64] strategy: matrix: @@ -81,7 +123,6 @@ jobs: linux-build: name: Build Linux - needs: clang-format runs-on: [self-hosted, linux, x64] strategy: matrix: -- cgit v1.2.3 From 0fa48b0dcb6bcd5d1ea3d34a8d3f7e39951a7282 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Tue, 24 May 2022 23:52:45 +0200 Subject: use exclude regex in clang format --- .github/workflows/self_host_build.yml | 261 ++++++++++++++-------------------- 1 file changed, 104 insertions(+), 157 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/self_host_build.yml b/.github/workflows/self_host_build.yml index eb378e5f6..1c7b466ca 100644 --- a/.github/workflows/self_host_build.yml +++ b/.github/workflows/self_host_build.yml @@ -13,163 +13,110 @@ jobs: steps: - uses: actions/checkout@v2 - - name: clang-format 'zen' + - name: clang-format uses: jidicula/clang-format-action@v4.6.2 with: clang-format-version: '13' - check-path: 'zen' - - - name: clang-format 'zencore' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zencore' - - - name: clang-format 'zencore-test' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zencore-test' - - - name: clang-format 'zenhttp' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zenhttp' - - - name: clang-format 'zenserver-test' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zenserver-test' - - - name: clang-format 'zenstore' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zenstore' - - - name: clang-format 'zenstore-test' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zenstore-test' - - - name: clang-format 'zentest-appstub' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zentest-appstub' - - - name: clang-format 'zenutil' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zenutil' - - - name: clang-format 'zenserver' - uses: jidicula/clang-format-action@v4.6.2 - with: - clang-format-version: '13' - check-path: 'zenserver' - - windows-build: - name: Build Windows - runs-on: [self-hosted, windows, x64] - strategy: - matrix: - config: - - 'debug' - - 'release' - arch: - - '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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 - - - 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: - name: Build Linux - runs-on: [self-hosted, linux, x64] - strategy: - matrix: - config: - - 'debug' - - 'release' - arch: - - 'x86_64' - env: - VCPKG_VERSION: 2022.03.10 - - 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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 - - - 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 + check-path: '.' + exclude-regex: (.*thirdparty.*) + +# windows-build: +# name: Build Windows +# runs-on: [self-hosted, windows, x64] +# strategy: +# matrix: +# config: +# - 'debug' +# - 'release' +# arch: +# - '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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 +# +# - 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: +# name: Build Linux +# runs-on: [self-hosted, linux, x64] +# strategy: +# matrix: +# config: +# - 'debug' +# - 'release' +# arch: +# - 'x86_64' +# env: +# VCPKG_VERSION: 2022.03.10 +# +# 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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 +# +# - 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 -- cgit v1.2.3 From 99de2b0b94303b164f08ff095f3284f013b5439c Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Tue, 24 May 2022 23:56:59 +0200 Subject: re-enable tests --- .github/workflows/self_host_build.yml | 200 +++++++++++++++++----------------- 1 file changed, 100 insertions(+), 100 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/self_host_build.yml b/.github/workflows/self_host_build.yml index 1c7b466ca..8bb57a4b4 100644 --- a/.github/workflows/self_host_build.yml +++ b/.github/workflows/self_host_build.yml @@ -20,103 +20,103 @@ jobs: check-path: '.' exclude-regex: (.*thirdparty.*) -# windows-build: -# name: Build Windows -# runs-on: [self-hosted, windows, x64] -# strategy: -# matrix: -# config: -# - 'debug' -# - 'release' -# arch: -# - '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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 -# -# - 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: -# name: Build Linux -# runs-on: [self-hosted, linux, x64] -# strategy: -# matrix: -# config: -# - 'debug' -# - 'release' -# arch: -# - 'x86_64' -# env: -# VCPKG_VERSION: 2022.03.10 -# -# 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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 -# -# - 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 + windows-build: + name: Build Windows + runs-on: [self-hosted, windows, x64] + strategy: + matrix: + config: + - 'debug' + - 'release' + arch: + - '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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 + + - 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: + name: Build Linux + runs-on: [self-hosted, linux, x64] + strategy: + matrix: + config: + - 'debug' + - 'release' + arch: + - 'x86_64' + env: + VCPKG_VERSION: 2022.03.10 + + 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 }}-${{ matrix.config }}-${{env.VCPKG_VERSION}}-${{ hashFiles('xmake.lua') }}-${{ matrix.arch }}-v5 + + - 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 -- cgit v1.2.3