From df32f5917804aaa9f6d327d6a334ec5100e4d100 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Tue, 2 Jul 2024 11:11:21 -0700 Subject: [PATCH] workflow not action --- .github/workflows/e2e.yml | 14 +++++++------- .../e2e.yml => workflows/reusable-e2e.yml} | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) rename .github/{actions/e2e.yml => workflows/reusable-e2e.yml} (96%) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index c6b78d2f2b..9679d05b95 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -13,14 +13,14 @@ jobs: strategy: matrix: include: - - make_target: "start-e2e-test" - runs_on: ubuntu-20.04 + - make-target: "start-e2e-test" + runs-on: ubuntu-20.04 run: true - - make_target: "start-upgrade-test-light" - runs_on: ubuntu-20.04 + - make-target: "start-upgrade-test-light" + runs-on: ubuntu-20.04 run: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'MINIMAL_CI') }} - uses: ./.github/actions/e2e.yml + uses: ./.github/workflows/reusable-e2e.yml with: - make_target: ${{ matrix.make_target }} - runs_on: ${{ matrix.runs_on}} + make-target: ${{ matrix.make-target }} + runs-on: ${{ matrix.runs-on}} run: ${{ matrix.run }} diff --git a/.github/actions/e2e.yml b/.github/workflows/reusable-e2e.yml similarity index 96% rename from .github/actions/e2e.yml rename to .github/workflows/reusable-e2e.yml index fa3b4e1174..803b6b803d 100644 --- a/.github/actions/e2e.yml +++ b/.github/workflows/reusable-e2e.yml @@ -2,11 +2,11 @@ name: Reusable E2E Testing Workflow on: workflow_call: inputs: - make_target: + make-target: description: 'Makefile target to execute in the Start Test step' required: true type: string - timeout_minutes: + timeout-minutes: description: 'The maximum number of minutes the job can run' type: number default: 25 @@ -14,7 +14,7 @@ on: description: 'Whether to run the job or not' required: true type: boolean - runs_on: + runs-on: description: 'The runner to use for the job' required: true type: string @@ -22,8 +22,8 @@ on: jobs: e2e-test: - if: ${{ run }} - runs-on: ${{ runs_on }} + if: ${{ inputs.run }} + runs-on: ${{ inputs.runs-on }} timeout-minutes: ${{ inputs.timeout_minutes }} steps: - uses: actions/checkout@v4