Skip to content

Commit b7e9a26

Browse files
willieyzmkannwischer
authored andcommitted
CI: Add (multi-)functest parameter for extra environment variables
Signed-off-by: willieyz <willie.zhao@chelpis.com>
1 parent ecb6585 commit b7e9a26

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

.github/actions/functest/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ inputs:
6060
extra_args:
6161
description: Additional arguments to pass to the tests script
6262
default: ""
63+
extra_env:
64+
description: Additional environment variables to set when calling the tests script
65+
default: ""
6366
runs:
6467
using: composite
6568
steps:
@@ -108,7 +111,7 @@ runs:
108111
shell: ${{ env.SHELL }}
109112
run: |
110113
make clean
111-
./scripts/tests all ${{ inputs.check_namespace == 'true' && '--check-namespace' || ''}} --exec-wrapper="${{ inputs.exec_wrapper }}" --cross-prefix="${{ inputs.cross_prefix }}" --cflags="${{ inputs.cflags }}" --ldflags="${{ inputs.ldflags }}" --opt=${{ inputs.opt }} --${{ env.FUNC }} --${{ env.KAT }} --${{ env.ACVP }} --${{ env.EXAMPLES }} --${{ env.STACK }} --${{ env.UNIT }} -v ${{ inputs.extra_args }}
114+
${{ inputs.extra_env }} ./scripts/tests all ${{ inputs.check_namespace == 'true' && '--check-namespace' || ''}} --exec-wrapper="${{ inputs.exec_wrapper }}" --cross-prefix="${{ inputs.cross_prefix }}" --cflags="${{ inputs.cflags }}" --ldflags="${{ inputs.ldflags }}" --opt=${{ inputs.opt }} --${{ env.FUNC }} --${{ env.KAT }} --${{ env.ACVP }} --${{ env.EXAMPLES }} --${{ env.STACK }} --${{ env.UNIT }} -v ${{ inputs.extra_args }}
112115
- name: Post ${{ env.MODE }} Tests
113116
shell: ${{ env.SHELL }}
114117
if: success() || failure()

.github/actions/multi-functest/action.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ inputs:
5757
extra_args:
5858
description: Additional arguments to pass to the tests script
5959
default: ""
60+
extra_env:
61+
description: Additional environment variables to set when calling the tests script
62+
default: ""
6063
runs:
6164
using: composite
6265
steps:
@@ -80,6 +83,7 @@ runs:
8083
check_namespace: ${{ inputs.check_namespace }}
8184
stack: ${{ inputs.stack }}
8285
extra_args: ${{ inputs.extra_args }}
86+
extra_env: ${{ inputs.extra_env }}
8387
- name: Cross x86_64 Tests
8488
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-x86_64') && (success() || failure()) }}
8589
uses: ./.github/actions/functest
@@ -102,6 +106,7 @@ runs:
102106
check_namespace: ${{ inputs.check_namespace }}
103107
stack: ${{ inputs.stack }}
104108
extra_args: ${{ inputs.extra_args }}
109+
extra_env: ${{ inputs.extra_env }}
105110
- name: Cross aarch64 Tests
106111
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-aarch64') && (success() || failure()) }}
107112
uses: ./.github/actions/functest
@@ -124,6 +129,7 @@ runs:
124129
check_namespace: ${{ inputs.check_namespace }}
125130
stack: ${{ inputs.stack }}
126131
extra_args: ${{ inputs.extra_args }}
132+
extra_env: ${{ inputs.extra_env }}
127133
- name: Cross ppc64le Tests
128134
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-ppc64le') && (success() || failure()) }}
129135
uses: ./.github/actions/functest
@@ -146,6 +152,7 @@ runs:
146152
check_namespace: ${{ inputs.check_namespace }}
147153
stack: ${{ inputs.stack }}
148154
extra_args: ${{ inputs.extra_args }}
155+
extra_env: ${{ inputs.extra_env }}
149156
- name: Cross aarch64_be Tests
150157
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-aarch64_be') && (success() || failure()) }}
151158
uses: ./.github/actions/functest
@@ -168,6 +175,7 @@ runs:
168175
check_namespace: ${{ inputs.check_namespace }}
169176
stack: ${{ inputs.stack }}
170177
extra_args: ${{ inputs.extra_args }}
178+
extra_env: ${{ inputs.extra_env }}
171179
- name: Cross riscv64 Tests (RVV, VLEN=128)
172180
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-riscv64') && (success() || failure()) }}
173181
uses: ./.github/actions/functest
@@ -190,6 +198,7 @@ runs:
190198
check_namespace: ${{ inputs.check_namespace }}
191199
stack: ${{ inputs.stack }}
192200
extra_args: ${{ inputs.extra_args }}
201+
extra_env: ${{ inputs.extra_env }}
193202
- name: Cross riscv64 Tests (RVV, VLEN=256)
194203
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-riscv64') && (success() || failure()) }}
195204
uses: ./.github/actions/functest
@@ -211,6 +220,7 @@ runs:
211220
check_namespace: ${{ inputs.check_namespace }}
212221
stack: ${{ inputs.stack }}
213222
extra_args: ${{ inputs.extra_args }}
223+
extra_env: ${{ inputs.extra_env }}
214224
- name: Cross riscv64 Tests (RVV, VLEN=512)
215225
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-riscv64') && (success() || failure()) }}
216226
uses: ./.github/actions/functest
@@ -232,6 +242,7 @@ runs:
232242
check_namespace: ${{ inputs.check_namespace }}
233243
stack: ${{ inputs.stack }}
234244
extra_args: ${{ inputs.extra_args }}
245+
extra_env: ${{ inputs.extra_env }}
235246
- name: Cross riscv64 Tests (RVV, VLEN=1024)
236247
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-riscv64') && (success() || failure()) }}
237248
uses: ./.github/actions/functest
@@ -253,6 +264,7 @@ runs:
253264
check_namespace: ${{ inputs.check_namespace }}
254265
stack: ${{ inputs.stack }}
255266
extra_args: ${{ inputs.extra_args }}
267+
extra_env: ${{ inputs.extra_env }}
256268
- name: Cross riscv32 Tests
257269
if: ${{ (inputs.compile_mode == 'all' || inputs.compile_mode == 'cross-riscv32') && (success() || failure()) }}
258270
uses: ./.github/actions/functest
@@ -275,4 +287,5 @@ runs:
275287
check_namespace: ${{ inputs.check_namespace }}
276288
stack: ${{ inputs.stack }}
277289
extra_args: ${{ inputs.extra_args }}
290+
extra_env: ${{ inputs.extra_env }}
278291

0 commit comments

Comments
 (0)