From f488fdd311d09a2fb69e348ef88f0a896fd34c20 Mon Sep 17 00:00:00 2001
From: Alex Dunn <alex.dunn@epicgames.com>
Date: Fri, 13 May 2022 09:41:14 -0700
Subject: Testing version increment and label filtering for release build

---
 .github/workflows/update_release.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/update_release.yml b/.github/workflows/update_release.yml
index 62568d1c0..734480134 100644
--- a/.github/workflows/update_release.yml
+++ b/.github/workflows/update_release.yml
@@ -3,12 +3,13 @@ name: Build release
 on:
   # push
   pull_request:
-    types: [closed]
+    types: [closed, labeled]
     branches: [ main ]
 
 jobs:
   windows-build:
     # if: github.event.pull_request.merged == true
+    if: contains( github.event.pull_request.labels.*.name, 'release')
     name: Build Windows
     runs-on: [self-hosted, windows, x64]
     strategy:
@@ -75,7 +76,15 @@ jobs:
         $latest = (Invoke-WebRequest -Headers @{"Accept"="application/vnd.github.v3+json";"Authorization"="token ${{ secrets.GITHUB_TOKEN }}"} $releases | ConvertFrom-Json)[0]
         $current_version_tag = [version]$latest.tag_name.replace('v','')
         echo "Current version" $current_version_tag
-        $new_version_tag = [version]::New($current_version_tag.Major,$current_version_tag.Minor,$current_version_tag.Build,$current_version_tag.Revision+1).toString()
+        if ($current_version_tag.Revision >= 9) {
+          if ($current_version_tag.Build >= 9) {
+            $new_version_tag = [version]::New($current_version_tag.Major,$current_version_tag.Minor+1,0,0).toString()
+          }else {
+            $new_version_tag = [version]::New($current_version_tag.Major,$current_version_tag.Minor,$current_version_tag.Build+1,0).toString()
+          }
+        }else {
+          $new_version_tag = [version]::New($current_version_tag.Major,$current_version_tag.Minor,$current_version_tag.Build,$current_version_tag.Revision+1).toString()
+        }
         echo $new_version_tag
         echo "new_version_tag=$new_version_tag" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-- 
cgit v1.2.3


From e0d3333df269715d7d1480a859e083539a339ff7 Mon Sep 17 00:00:00 2001
From: Alex Dunn <alex.dunn@epicgames.com>
Date: Fri, 13 May 2022 09:57:42 -0700
Subject: Testing label trigger

---
 .github/workflows/update_release.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/update_release.yml b/.github/workflows/update_release.yml
index 734480134..ec0fcba52 100644
--- a/.github/workflows/update_release.yml
+++ b/.github/workflows/update_release.yml
@@ -3,13 +3,14 @@ name: Build release
 on:
   # push
   pull_request:
-    types: [closed, labeled]
+    types: [closed]
     branches: [ main ]
 
 jobs:
   windows-build:
-    # if: github.event.pull_request.merged == true
-    if: contains( github.event.pull_request.labels.*.name, 'release')
+    if: >-
+      github.event.pull_request.merged == true &&
+      contains( github.event.pull_request.labels.*.name, 'release')
     name: Build Windows
     runs-on: [self-hosted, windows, x64]
     strategy:
-- 
cgit v1.2.3