Skip to content

Commit d51e0e6

Browse files
committed
Remove package installation and update upload artifacts
1 parent 09c5f1f commit d51e0e6

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

.github/workflows/universal_workflow_light.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ jobs:
273273
# actionlint variables
274274
actionlint_skip: ${{ steps.ltp.outputs.actionlint_skip }}
275275
actionlint_custom_config: ${{ steps.ltp.outputs.actionlint_custom_config }}
276+
actionlint_output_artifact_prefix: ${{ steps.ltp.outputs.actionlint_output_artifact_prefix }}
277+
actionlint_output_path: ${{ steps.ltp.outputs.actionlint_output_path }}
276278
# finish variables
277279
finish_matrix_mysql: ${{ steps.ltp.outputs.finish_matrix_mysql }}
278280
finish_matrix_php: ${{ steps.ltp.outputs.finish_matrix_php }}
@@ -1277,21 +1279,12 @@ jobs:
12771279
if: ${{ always() && needs.init.outputs.actionlint_skip != 'true' }}
12781280
runs-on: ${{ fromJSON(inputs.runs_on) }}
12791281
steps:
1280-
- name: Install npm on private runner
1281-
if: ${{ inputs.runs_on != '"ubuntu-latest"'}}
1282-
run: |
1283-
NPM=$(type -p 'npm'||true)
1284-
PIPX=$(type -p 'pipx'||true)
1285-
if [ -z "${NPM}" ] || [ -z "${PIPX}" ]; then
1286-
echo -e "\033[0;35m### Installing npm, shellcheck, pipx ###\033[0m"
1287-
sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update
1288-
sudo apt-get -qq install npm shellcheck pipx python3-venv
1289-
fi
1290-
12911282
- name: 'Run actionlint'
12921283
uses: 'OXID-eSales/github-actions/actionlint@v0'
12931284
with:
12941285
custom_config: ${{ needs.init.outputs.actionlint_custom_config }}
1286+
output_artifact_prefix: ${{ needs.init.outputs.actionlint_output_artifact_prefix }}
1287+
output_path: ${{ needs.init.outputs.actionlint_output_path }}
12951288

12961289
- name: 'Write actionlint Report'
12971290
if: always()

.github/workflows/universal_workflow_light.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ jobs:
273273
# actionlint variables
274274
actionlint_skip: ${{ steps.ltp.outputs.actionlint_skip }}
275275
actionlint_custom_config: ${{ steps.ltp.outputs.actionlint_custom_config }}
276+
actionlint_output_artifact_prefix: ${{ steps.ltp.outputs.actionlint_output_artifact_prefix }}
277+
actionlint_output_path: ${{ steps.ltp.outputs.actionlint_output_path }}
276278
# finish variables
277279
finish_matrix_mysql: ${{ steps.ltp.outputs.finish_matrix_mysql }}
278280
finish_matrix_php: ${{ steps.ltp.outputs.finish_matrix_php }}
@@ -1277,21 +1279,12 @@ jobs:
12771279
if: ${{ always() && needs.init.outputs.actionlint_skip != 'true' }}
12781280
runs-on: ${{ fromJSON(inputs.runs_on) }}
12791281
steps:
1280-
- name: Install npm on private runner
1281-
if: ${{ inputs.runs_on != '"ubuntu-latest"'}}
1282-
run: |
1283-
NPM=$(type -p 'npm'||true)
1284-
PIPX=$(type -p 'pipx'||true)
1285-
if [ -z "${NPM}" ] || [ -z "${PIPX}" ]; then
1286-
echo -e "\033[0;35m### Installing npm, shellcheck, pipx ###\033[0m"
1287-
sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update
1288-
sudo apt-get -qq install npm shellcheck pipx python3-venv
1289-
fi
1290-
12911282
- name: 'Run actionlint'
12921283
uses: 'OXID-eSales/github-actions/actionlint@v0'
12931284
with:
12941285
custom_config: ${{ needs.init.outputs.actionlint_custom_config }}
1286+
output_artifact_prefix: ${{ needs.init.outputs.actionlint_output_artifact_prefix }}
1287+
output_path: ${{ needs.init.outputs.actionlint_output_path }}
12951288

12961289
- name: 'Write actionlint Report'
12971290
if: always()

actionlint/action.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ inputs:
1010
type: string
1111
description: 'Custom configuration to the linter'
1212
required: true
13-
output_artifact:
13+
output_artifact_prefix:
1414
type: string
1515
required: false
1616
description: 'Github run artifact for the output'
17-
default: 'actionlint-config.yaml'
17+
default: 'actionlint'
18+
output_path:
19+
type: string
20+
required: false
21+
description: 'List of the additional files to upload to the artifacts'
22+
default: ''
1823

1924
runs:
2025
using: "composite"
@@ -73,5 +78,8 @@ runs:
7378
if: always()
7479
uses: actions/upload-artifact@v4
7580
with:
76-
name: ${{ inputs.output_artifact }}
77-
path: ${{ inputs.config_file }}
81+
name: ${{ inputs.output_artifact_prefix }}
82+
include-hidden-files: true
83+
path: |
84+
${{ inputs.config_file }}
85+
${{ inputs.output_path }}

0 commit comments

Comments
 (0)