From b260565373c1a1fd13f4861d995f8cd5b7331dd7 Mon Sep 17 00:00:00 2001 From: Bart Thomee <11445373+bthomee@users.noreply.github.com> Date: Sun, 27 Jul 2025 11:13:17 -0400 Subject: [PATCH] env is unavailable to pass to reusable workflows in 'with' --- .github/workflows/check-clang-format.yml | 10 ++-------- .github/workflows/check-levelization.yml | 10 ++-------- .github/workflows/main.yml | 11 +---------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/check-clang-format.yml b/.github/workflows/check-clang-format.yml index 5a11e3c696..ffe50598ae 100644 --- a/.github/workflows/check-clang-format.yml +++ b/.github/workflows/check-clang-format.yml @@ -3,13 +3,7 @@ name: Clang Format # This workflow can only be triggered by other workflows. -on: - workflow_call: - inputs: - runner: - description: 'A string representing the GitHub runner to use.' - required: true - type: string +on: workflow_call concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -21,7 +15,7 @@ defaults: jobs: clang-format: - runs-on: ${{ inputs.runner }} + runs-on: ubuntu-latest container: ghcr.io/xrplf/ci/tools-rippled-clang-format steps: # The $GITHUB_WORKSPACE and ${{ github.workspace }} might not point to the diff --git a/.github/workflows/check-levelization.yml b/.github/workflows/check-levelization.yml index 8f47995505..cd6d704acd 100644 --- a/.github/workflows/check-levelization.yml +++ b/.github/workflows/check-levelization.yml @@ -3,13 +3,7 @@ name: Levelization # This workflow can only be triggered by other workflows. -on: - workflow_call: - inputs: - runner: - description: 'A string representing the GitHub runner to use.' - required: true - type: string +on: workflow_call concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -21,7 +15,7 @@ defaults: jobs: levelization: - runs-on: ${{ inputs.runner }} + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 657cd06e91..dbabeab3c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,35 +23,26 @@ env: # The Conan remote where the dependencies will be cached. CONAN_REMOTE_NAME: xrplf CONAN_REMOTE_URL: https://conan.ripplex.io - # The default runner for the jobs. This can be overridden in individual jobs. - RUNNER: ubuntu-latest jobs: # This job exposes the environment variables that will be used by other jobs. # It is a workaround for the env-context not being available in the 'with' # steps when calling other workflows. env-vars: - runs-on: ${{ env.RUNNER }} + runs-on: ubuntu-latest steps: - run: echo "Exposing environment variables." outputs: conan_remote_name: ${{ env.CONAN_REMOTE_NAME }} conan_remote_url: ${{ env.CONAN_REMOTE_URL }} - runner: ${{ env.RUNNER }} check-clang-format: - needs: env-vars if: github.event.pull_request.draft == false || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') uses: ./.github/workflows/check-clang-format.yml - with: - runner: ${{ needs.env-vars.outputs.runner }} check-levelization: - needs: env-vars if: github.event.pull_request.draft == false || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') uses: ./.github/workflows/check-levelization.yml - with: - runner: ${{ needs.env-vars.outputs.runner }} debian: needs: