From 8314e9721e37ffe72cbb8bae2bc4680c64399a0a Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 26 May 2022 00:42:33 +0200
Subject: remove windows bundle cancel previous validate for same branch (not
 main)

---
 .github/workflows/validate.yml | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 59354161f..b715a8c63 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -6,6 +6,17 @@ on:
     branches: [ main ]
 
 jobs:
+  cancel-old-build:
+    name: Cancel previous builds
+    runs-on: [self-hosted, linux, x64]
+
+    steps:
+    - name: Cancel Previous Runs
+      if: ${{ github.ref_name != 'main'}}
+      uses: styfle/cancel-workflow-action@0.9.1
+      with:
+        access_token: ${{ github.token }}
+
   clang-format:
     name: Check clang-format
     runs-on: [self-hosted, linux, x64]
@@ -58,19 +69,19 @@ 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: 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: |
-- 
cgit v1.2.3