diff options
| author | Dan Engelbrecht <[email protected]> | 2022-05-26 00:39:11 +0200 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-06-02 00:35:51 +0200 |
| commit | 6b0c71806d9e0559880855591d338c70dca19fbf (patch) | |
| tree | d96e210942c336baac9c957bc8e8bf503e464cde /.github/workflows | |
| parent | show path (diff) | |
| download | zen-6b0c71806d9e0559880855591d338c70dca19fbf.tar.xz zen-6b0c71806d9e0559880855591d338c70dca19fbf.zip | |
go back to skipping windows bundle on release
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/create_release.yml | 34 | ||||
| -rw-r--r-- | .github/workflows/validate.yml | 12 |
2 files changed, 24 insertions, 22 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 6827030c1..fb6d41ff9 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -39,17 +39,17 @@ jobs: ${{ 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 +# - 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] @@ -109,11 +109,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 @@ -142,4 +142,4 @@ jobs: prerelease: ${{steps.get-prerelease.outputs.value}} files: | linux/zenserver-linux.zip - win64/zenserver-win64.zip +# win64/zenserver-win64.zip diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 9c163a268..59354161f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -2,7 +2,7 @@ name: Validate on: pull_request: - types: [opened, reopened] #, synchronize] + types: [opened, reopened, synchronize] branches: [ main ] jobs: @@ -35,7 +35,8 @@ jobs: VCPKG_VERSION: 2022.03.10 steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 @@ -64,7 +65,7 @@ jobs: env: VCPKG_ROOT: ${{ github.workspace }}/.vcpkg - - name: upload zenserver-linux + - name: Upload zenserver-linux if: ${{ github.ref_name == 'main'}} uses: actions/upload-artifact@v3 with: @@ -98,7 +99,8 @@ jobs: VCPKG_VERSION: 2022.03.10 steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 - name: Set up GCC 11 uses: egor-tensin/setup-gcc@v1 @@ -132,7 +134,7 @@ jobs: env: VCPKG_ROOT: ${{ github.workspace }}/.vcpkg - - name: upload zenserver-win64 + - name: Upload zenserver-win64 if: ${{ github.ref_name == 'main'}} uses: actions/upload-artifact@v3 with: |