workflow fixes (#1)

* update validate action for enterprise github 
* updated runner setup options
* updated release workflow for enterprise github

2 files changed, 22 insertions, 25 deletions

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 315fafbe2..c417d412e 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup xmake
-      uses: xmake-io/github-action-setup-xmake@v1
+      uses: ue-foundation/[email protected]
       with:
         xmake-version: ${{env.XMAKE_VERSION}}
 
@@ -44,8 +44,7 @@ jobs:
 
     - name: Bundle
       run: |
-        xmake bundle -v -y
- #        xmake bundle -v -y --codesignidentity="Epic Games"
+        xmake bundle -v -y --codesignidentity="Epic Games"
       env:
         VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
@@ -72,7 +71,7 @@ jobs:
         ./scripts/ue_build_linux/get_ue_toolchain.sh ./.tmp-ue-toolchain
 
     - name: Setup xmake
-      uses: xmake-io/github-action-setup-xmake@v1
+      uses: ue-foundation/[email protected]
       with:
         xmake-version: ${{env.XMAKE_VERSION}}
 
@@ -127,7 +126,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup xmake
-      uses: xmake-io/github-action-setup-xmake@v1
+      uses: ue-foundation/[email protected]
       with:
         xmake-version: ${{env.XMAKE_VERSION}}
 
@@ -188,7 +187,7 @@ jobs:
 
     - name: Read VERSION.txt
       id: read_version
-      uses: juliangruber/read-file-action@v1
+      uses: ue-foundation/read-file-action@v1
       with:
         path: "./VERSION.txt"
 
@@ -227,13 +226,13 @@ jobs:
 
     - name: Read CHANGELOG.tmp
       id: read_changelog
-      uses: juliangruber/read-file-action@v1
+      uses: ue-foundation/read-file-action@v1
       with:
         path: "./CHANGELOG.tmp"
 
     - name: Check prerelease
       id: get-prerelease
-      uses: haya14busa/action-cond@v1
+      uses: ue-foundation/action-cond@v1
       with:
         cond: ${{contains(steps.read_version.outputs.content, '-pre')}}
         if_true: "true"
@@ -241,7 +240,7 @@ jobs:
 
     - name: Create Release
       id: create_release
-      uses: softprops/action-gh-release@v1
+      uses: ue-foundation/action-gh-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 0bec014c4..21f254dd4 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -21,25 +21,25 @@ on:
 jobs:
   cancel-old-build:
     name: Cancel previous builds
-    runs-on: [self-hosted, linux, x64]
+    runs-on: [HV, linux, x64]
 
     steps:
     - name: Cancel Previous Runs
       if: ${{ github.ref_name != 'main'}}
-      uses: styfle/[email protected]
+      uses: ue-foundation/[email protected]
       with:
         access_token: ${{ github.token }}
 
   clang-format:
     needs: cancel-old-build
     name: Check clang-format
-    runs-on: [self-hosted, linux, x64]
+    runs-on: [HV, linux, x64]
 
     steps:
     - uses: actions/checkout@v3
 
     - name: clang-format
-      uses: jidicula/[email protected]
+      uses: ue-foundation/[email protected]
       with:
         clang-format-version: '13'
         check-path: 'src'
@@ -47,7 +47,7 @@ jobs:
   windows-build:
     needs: cancel-old-build
     name: Build & Test Windows
-    runs-on: [self-hosted, windows, x64]
+    runs-on: [HV, windows, x64]
     timeout-minutes: 25
     strategy:
           matrix:
@@ -62,7 +62,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup xmake
-      uses: xmake-io/github-action-setup-xmake@v1
+      uses: ue-foundation/[email protected]
       with:
         xmake-version: ${{env.XMAKE_VERSION}}
 
@@ -71,7 +71,6 @@ jobs:
         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: Config
@@ -96,9 +95,8 @@ jobs:
 
     - name: Bundle
       if: ${{ matrix.config == 'release' }}
-      run: |
+      run: | # xmake bundle -v -y --codesignidentity="Epic Games"
         xmake bundle -v -y
-#        xmake bundle -v -y --codesignidentity="Epic Games"
       env:
         VCPKG_ROOT: ${{ github.workspace }}/.vcpkg
 
@@ -112,7 +110,7 @@ jobs:
   linux-build:
     needs: cancel-old-build
     name: Build & Test Linux
-    runs-on: [self-hosted, linux, x64]
+    runs-on: [HV, linux, x64]
     timeout-minutes: 25
     strategy:
           matrix:
@@ -132,7 +130,7 @@ jobs:
         ./scripts/ue_build_linux/get_ue_toolchain.sh ./.tmp-ue-toolchain
 
     - name: Setup xmake
-      uses: xmake-io/github-action-setup-xmake@v1
+      uses: ue-foundation/[email protected]
       with:
         xmake-version: ${{env.XMAKE_VERSION}}
 
@@ -180,8 +178,8 @@ jobs:
   macos-build:
     needs: cancel-old-build
     name: Build & Test MacOS
-    runs-on: [self-hosted, macos, x64]
-    timeout-minutes: 15
+    runs-on: [HV, macos, x64]
+    timeout-minutes: 25
     strategy:
           matrix:
             config:
@@ -195,7 +193,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup xmake
-      uses: xmake-io/github-action-setup-xmake@v1
+      uses: ue-foundation/[email protected]
       with:
         xmake-version: ${{env.XMAKE_VERSION}}
 
@@ -228,8 +226,8 @@ jobs:
 
     - name: Bundle
       if: ${{ matrix.config == 'release' }}
-      run: |
-        xmake bundle -v -y --codesignidentity="Developer ID Application"
+      run: | # xmake bundle -v -y --codesignidentity="Developer ID Application"
+        xmake bundle -v -y
       env:
         VCPKG_ROOT: ${{ github.workspace }}/.vcpkg