Skip to content

Commit 3bfb514

Browse files
greenc-FNALgreenc-FNAL
committed
Address env: consistency issue
- per Framework-R-D#262 (comment)
1 parent 89ec0a3 commit 3bfb514

6 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎.github/workflows/actionlint-check.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
type: string
3131

3232
env:
33-
local-checkout-path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
33+
local_checkout_path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
3434

3535
jobs:
3636
pre-check:
@@ -59,13 +59,13 @@ jobs:
5959
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6060
with:
6161
fetch-depth: 0
62-
path: ${{ env.local-checkout-path }}
62+
path: ${{ env.local_checkout_path }}
6363

6464
- name: Detect workflow changes
6565
id: filter
6666
uses: Framework-R-D/phlex/.github/actions/detect-relevant-changes@main
6767
with:
68-
repo-path: ${{ env.local-checkout-path }}
68+
repo-path: ${{ env.local_checkout_path }}
6969
base-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-base-sha) || github.event.pull_request.base.sha || github.event.before }}
7070
head-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-head-sha) || github.event.pull_request.head.sha || github.sha }}
7171
include-globs: |
@@ -99,7 +99,7 @@ jobs:
9999
- name: Checkout code
100100
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
101101
with:
102-
path: ${{ env.local-checkout-path }}
102+
path: ${{ env.local_checkout_path }}
103103

104104
- name: Announce actionlint check
105105
run: echo "➡️ Running actionlint check..."
@@ -108,7 +108,7 @@ jobs:
108108
id: lint
109109
run: |
110110
docker run --rm \
111-
-v "${{ github.workspace }}/${{ env.local-checkout-path }}:/work" \
111+
-v "${{ github.workspace }}/${{ env.local_checkout_path }}:/work" \
112112
-w /work \
113113
rhysd/actionlint:latest \
114114
-config-file .github/actionlint.yaml

‎.github/workflows/cmake-build.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ permissions:
6464
env:
6565
BUILD_TYPE: Release
6666
CICOLOR_FORCE: 1
67-
local-checkout-path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
68-
local-build-path: ${{ (github.event_name == 'workflow_call' && inputs.build-path) || format('{0}-build', github.event.repository.name) }}
67+
local_checkout_path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
68+
local_build_path: ${{ (github.event_name == 'workflow_call' && inputs.build-path) || format('{0}-build', github.event.repository.name) }}
6969

7070
jobs:
7171
pre-check:
@@ -136,13 +136,13 @@ jobs:
136136
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
137137
with:
138138
fetch-depth: 0
139-
path: ${{ env.local-checkout-path }}
139+
path: ${{ env.local_checkout_path }}
140140

141141
- name: Detect C++ and CMake changes
142142
id: filter
143143
uses: Framework-R-D/phlex/.github/actions/detect-relevant-changes@main
144144
with:
145-
repo-path: ${{ env.local-checkout-path }}
145+
repo-path: ${{ env.local_checkout_path }}
146146
base-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-base-sha) || github.event.pull_request.base.sha || github.event.before }}
147147
head-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-head-sha) || github.event.pull_request.head.sha || github.sha }}
148148
file-type: |
@@ -195,14 +195,14 @@ jobs:
195195
- name: Check out code
196196
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
197197
with:
198-
path: ${{ env.local-checkout-path }}
198+
path: ${{ env.local_checkout_path }}
199199
ref: ${{ needs.pre-check.outputs.sha }}
200200
repository: ${{ needs.pre-check.outputs.repo }}
201201

202202
- name: Setup build environment
203203
uses: Framework-R-D/phlex/.github/actions/setup-build-env@main
204204
with:
205-
build-path: ${{ env.local-build-path }}
205+
build-path: ${{ env.local_build_path }}
206206

207207
- name: Announce CMake configuration
208208
run: echo "➡️ Configuring CMake..."
@@ -215,8 +215,8 @@ jobs:
215215
id: configure
216216
uses: Framework-R-D/phlex/.github/actions/configure-cmake@main
217217
with:
218-
source-path: ${{ env.local-checkout-path }}
219-
build-path: ${{ env.local-build-path }}
218+
source-path: ${{ env.local_checkout_path }}
219+
build-path: ${{ env.local_build_path }}
220220
build-type: ${{ env.BUILD_TYPE }}
221221
cpp-compiler: ${{ matrix.compiler == 'gcc' && 'g++' || 'clang++' }}
222222
extra-options: |
@@ -227,13 +227,13 @@ jobs:
227227
id: build
228228
uses: Framework-R-D/phlex/.github/actions/build-cmake@main
229229
with:
230-
build-path: ${{ env.local-build-path }}
230+
build-path: ${{ env.local_build_path }}
231231

232232
- name: Run tests
233233
if: matrix.sanitizer != 'valgrind'
234234
run: |
235235
. /entrypoint.sh
236-
cd "$GITHUB_WORKSPACE/${{ env.local-build-path }}"
236+
cd "$GITHUB_WORKSPACE/${{ env.local_build_path }}"
237237
238238
echo "➡️ Running tests..."
239239
echo "::group::Running ctest"
@@ -250,7 +250,7 @@ jobs:
250250
if: matrix.sanitizer == 'valgrind'
251251
run: |
252252
. /entrypoint.sh
253-
cd "$GITHUB_WORKSPACE/${{ env.local-build-path }}"
253+
cd "$GITHUB_WORKSPACE/${{ env.local_build_path }}"
254254
255255
echo "➡️ Running Valgrind tests..."
256256
echo "::group::Running ctest -T memcheck"

‎.github/workflows/cmake-format-check.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
type: string
3131

3232
env:
33-
local-checkout-path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
33+
local_checkout_path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
3434

3535
jobs:
3636
pre-check:
@@ -59,13 +59,13 @@ jobs:
5959
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6060
with:
6161
fetch-depth: 0
62-
path: ${{ env.local-checkout-path }}
62+
path: ${{ env.local_checkout_path }}
6363

6464
- name: Detect CMake formatting changes
6565
id: filter
6666
uses: Framework-R-D/phlex/.github/actions/detect-relevant-changes@main
6767
with:
68-
repo-path: ${{ env.local-checkout-path }}
68+
repo-path: ${{ env.local_checkout_path }}
6969
base-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-base-sha) || github.event.pull_request.base.sha || github.event.before }}
7070
head-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-head-sha) || github.event.pull_request.head.sha || github.sha }}
7171
file-type: cmake
@@ -93,7 +93,7 @@ jobs:
9393
- name: Checkout code
9494
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9595
with:
96-
path: ${{ env.local-checkout-path }}
96+
path: ${{ env.local_checkout_path }}
9797

9898
- name: Set up Python
9999
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -106,7 +106,7 @@ jobs:
106106
- name: Check CMake formatting
107107
run: |
108108
echo "➡️ Checking CMake file formatting..."
109-
if ! gersemi --check ${{ env.local-checkout-path }}; then
109+
if ! gersemi --check ${{ env.local_checkout_path }}; then
110110
echo "::error::Found files with formatting issues."
111111
echo "::error::Run 'gersemi -i <file>' locally or comment '@${{ github.event.repository.name }}bot format' on the PR to auto-fix."
112112
exit 1

‎.github/workflows/cmake-format-fix.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ permissions:
2525
contents: write
2626

2727
env:
28-
local-checkout-path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
28+
local_checkout_path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
2929

3030
jobs:
3131
parse-command:
@@ -56,7 +56,7 @@ jobs:
5656
- name: Checkout code
5757
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5858
with:
59-
path: ${{ env.local-checkout-path }}
59+
path: ${{ env.local_checkout_path }}
6060
ref: ${{ (github.event_name == 'workflow_call' && inputs.ref) || needs.parse-command.outputs.ref }}
6161
repository: ${{ (github.event_name == 'workflow_call' && inputs.repo) || needs.parse-command.outputs.repo }}
6262
token: ${{ secrets.WORKFLOW_PAT }}
@@ -72,13 +72,13 @@ jobs:
7272
- name: Apply CMake formatting
7373
run: |
7474
echo "Applying CMake formatting..."
75-
gersemi -i ${{ env.local-checkout-path }}
75+
gersemi -i ${{ env.local_checkout_path }}
7676
7777
- name: Handle fix commit
7878
uses: Framework-R-D/phlex/.github/actions/handle-fix-commit@main
7979
with:
8080
tool: cmake-format
81-
working-directory: ${{ env.local-checkout-path }}
81+
working-directory: ${{ env.local_checkout_path }}
8282
token: ${{ secrets.WORKFLOW_PAT }}
8383
pr-info-ref: ${{ (github.event_name == 'workflow_call' && inputs.ref) || needs.parse-command.outputs.ref }}
8484
pr-info-repo: ${{ (github.event_name == 'workflow_call' && inputs.repo) || needs.parse-command.outputs.repo }}

‎.github/workflows/python-check.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
type: string
3131

3232
env:
33-
local-checkout-path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
33+
local_checkout_path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
3434

3535
jobs:
3636
pre-check:
@@ -59,13 +59,13 @@ jobs:
5959
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6060
with:
6161
fetch-depth: 0
62-
path: ${{ env.local-checkout-path }}
62+
path: ${{ env.local_checkout_path }}
6363

6464
- name: Detect Python changes
6565
id: filter
6666
uses: Framework-R-D/phlex/.github/actions/detect-relevant-changes@main
6767
with:
68-
repo-path: ${{ env.local-checkout-path }}
68+
repo-path: ${{ env.local_checkout_path }}
6969
base-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-base-sha) || github.event.pull_request.base.sha || github.event.before }}
7070
head-ref: ${{ (github.event_name == 'workflow_call' && inputs.pr-head-sha) || github.event.pull_request.head.sha || github.sha }}
7171
file-type: python
@@ -95,7 +95,7 @@ jobs:
9595
- name: Checkout code
9696
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9797
with:
98-
path: ${{ env.local-checkout-path }}
98+
path: ${{ env.local_checkout_path }}
9999

100100
- name: Set up Python
101101
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -107,7 +107,7 @@ jobs:
107107
pip install ruff mypy
108108
109109
- name: Run ruff and mypy checks
110-
working-directory: ${{ env.local-checkout-path }}
110+
working-directory: ${{ env.local_checkout_path }}
111111
env:
112112
FORCE_COLOR: 1 # `ruff`/`colored` crate
113113
run: |

‎.github/workflows/python-fix.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ permissions:
2525
contents: write
2626

2727
env:
28-
local-checkout-path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
28+
local_checkout_path: ${{ (github.event_name == 'workflow_call' && inputs.checkout-path) || format('{0}-src', github.event.repository.name) }}
2929

3030
jobs:
3131
parse-command:
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5656
with:
57-
path: ${{ env.local-checkout-path }}
57+
path: ${{ env.local_checkout_path }}
5858
ref: ${{ (github.event_name == 'workflow_call' && inputs.ref) || needs.parse-command.outputs.ref }}
5959
repository: ${{ (github.event_name == 'workflow_call' && inputs.repo) || needs.parse-command.outputs.repo }}
6060
token: ${{ secrets.WORKFLOW_PAT }}
@@ -69,7 +69,7 @@ jobs:
6969
pip install ruff
7070
7171
- name: Run ruff format and fix
72-
working-directory: ${{ env.local-checkout-path }}
72+
working-directory: ${{ env.local_checkout_path }}
7373
env:
7474
FORCE_COLOR: 1
7575
run: |
@@ -82,7 +82,7 @@ jobs:
8282
uses: Framework-R-D/phlex/.github/actions/handle-fix-commit@main
8383
with:
8484
tool: 'Python linting'
85-
working-directory: ${{ env.local-checkout-path }}
85+
working-directory: ${{ env.local_checkout_path }}
8686
token: ${{ secrets.WORKFLOW_PAT }}
8787
pr-info-ref: ${{ (github.event_name == 'workflow_call' && inputs.ref) || needs.parse-command.outputs.ref }}
8888
pr-info-repo: ${{ (github.event_name == 'workflow_call' && inputs.repo) || needs.parse-command.outputs.repo }}

0 commit comments

Comments
 (0)