fix output values

hussein-awala · Aug 13, 2023 · 594cae9 · 594cae9
1 parent 41e926a
commit 594cae9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -51,7 +51,7 @@ jobs:
   build-info:
     timeout-minutes: 10
     name: "Build Info"
-    runs-on: [self-hosted, small]
+    runs-on: 'ubuntu-22.04'
     env:
       TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
     outputs:
@@ -66,7 +66,7 @@ jobs:
       cache-directive: ${{ steps.selective-checks.outputs.cache-directive }}
       default-branch: ${{ steps.selective-checks.outputs.default-branch }}
       default-constraints-branch: ${{ steps.selective-checks.outputs.default-constraints-branch }}
-      runs-on: [self-hosted, small]
+      runs-on: ${{ steps.selective-checks.outputs.runs-on }}
       target-commit-sha: "${{steps.discover-pr-merge-commit.outputs.target-commit-sha ||
           github.event.pull_request.head.sha ||
           github.sha

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,8 +114,14 @@ jobs:
       skip-pre-commits: ${{ steps.selective-checks.outputs.skip-pre-commits }}
       helm-test-packages: ${{ steps.selective-checks.outputs.helm-test-packages }}
       debug-resources: ${{ steps.selective-checks.outputs.debug-resources }}
+<<<<<<< HEAD
       runs-on: [self-hosted, small]
       has-migrations: ${{ steps.selective-checks.outputs.has-migrations }}
+||||||| constructed merge base
+      runs-on: [self-hosted, small]
+=======
+      runs-on: ${{ steps.selective-checks.outputs.runs-on }}
+>>>>>>> fix output values
       source-head-repo: ${{ steps.source-run-info.outputs.source-head-repo }}
       pull-request-labels: ${{ steps.source-run-info.outputs.pr-labels }}
       in-workflow-build: ${{ steps.source-run-info.outputs.in-workflow-build }}