diff options
| author | Dan Engelbrecht <[email protected]> | 2022-06-27 16:49:11 +0200 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-06-27 16:49:11 +0200 |
| commit | 27635ff8cd52f77eb26c3ea0d9d7ff670bb28814 (patch) | |
| tree | d481f088ebdc8205d6caf95bcc244868db08d3a8 | |
| parent | cache requests API (#134) (diff) | |
| download | zen-27635ff8cd52f77eb26c3ea0d9d7ff670bb28814.tar.xz zen-27635ff8cd52f77eb26c3ea0d9d7ff670bb28814.zip | |
disable macos github agent
| -rw-r--r-- | .github/workflows/create_release.yml | 102 | ||||
| -rw-r--r-- | .github/workflows/validate.yml | 136 |
2 files changed, 119 insertions, 119 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 116026b04..5aba8ac05 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.03.10 - - steps: - - uses: actions/checkout@v2 - -# - name: Set up GCC 11 -# uses: egor-tensin/setup-gcc@v1 +# bundle-macos: +# runs-on: [self-hosted, macos, x64] +# timeout-minutes: 15 +# 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: -# 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 +# 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-windows] #, bundle-macos] 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 1a6cd7ddc..30717bd3d 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -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.03.10 - - steps: - - name: Checkout - uses: actions/checkout@v2 - -# - name: Set up GCC 11 -# uses: egor-tensin/setup-gcc@v1 +# 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.03.10 +# +# 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: -# 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 - 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 +# 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 +# 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 |