Skip to content

Commit 5b74c27

Browse files
committed
fix(continuous-integration): improve support for working-directory
Signed-off-by: Emilien Escalle <[email protected]>
1 parent e96599d commit 5b74c27

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -327,27 +327,22 @@ jobs:
327327
volumes: ${{ fromJSON(needs.prepare.outputs.container-volumes || '[]') }}
328328
credentials: ${{ fromJSON(needs.prepare.outputs.container-username && format('{{"username":{0},"password":{1}}}',toJSON(needs.prepare.outputs.container-username),toJSON(secrets.container-password)) || '{}') }}
329329
outputs:
330+
working-directory: ${{ steps.working-directory.outputs.working-directory }}
330331
build-env: ${{ steps.build-variables.outputs.env }}
331332
build-commands: ${{ steps.build-variables.outputs.commands }}
332333
build-artifact: ${{ steps.build-variables.outputs.artifact }}
333-
working-directory: ${{ steps.build-variables.outputs.working-directory }}
334334
steps:
335335
- name: Checkout repository
336336
if: inputs.container == ''
337337
uses: hoverkraft-tech/ci-github-common/actions/checkout@5e8d0e6d1e76d8577a070db6d0128a91b1c9d5ad # 0.30.2
338338

339-
- id: build-variables
340-
if: inputs.build != ''
339+
- id: working-directory
341340
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
342341
env:
343-
WORKING_DIRECTORY: ${{ inputs.working-directory }}
344-
BUILD_INPUT: ${{ inputs.build }}
342+
WORKING_DIRECTORY_INPUT: ${{ inputs.working-directory }}
345343
with:
346344
script: |
347-
const fs = require('node:fs');
348-
const path = require('node:path');
349-
350-
let workingDirectory = process.env.WORKING_DIRECTORY || '.';
345+
let workingDirectory = process.env.WORKING_DIRECTORY_INPUT || '.';
351346
if (!path.isAbsolute(workingDirectory)) {
352347
workingDirectory = path.join(process.env.GITHUB_WORKSPACE, workingDirectory);
353348
}
@@ -360,6 +355,18 @@ jobs:
360355
core.debug(`Running in working directory: ${workingDirectory}`);
361356
core.setOutput('working-directory', workingDirectory);
362357
358+
- id: build-variables
359+
if: inputs.build != ''
360+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
361+
env:
362+
WORKING_DIRECTORY: ${{ steps.working-directory.outputs.working-directory }}
363+
BUILD_INPUT: ${{ inputs.build }}
364+
with:
365+
script: |
366+
const fs = require('node:fs');
367+
const path = require('node:path');
368+
369+
const workingDirectory = process.env.WORKING_DIRECTORY;
363370
const buildInput = process.env.BUILD_INPUT.trim();
364371
365372
let commands = [];

0 commit comments

Comments
 (0)