Skip to content

Commit 984ecb1

Browse files
committed
Remove crutfy workflow input
1 parent b45aa31 commit 984ecb1

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

.github/workflows/staging.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ on:
3434
type: boolean
3535
default: false
3636
description: Skip running the Salt packages test suite.
37-
skip-salt-pkg-download-test-suite:
38-
type: boolean
39-
default: false
40-
description: Skip running the Salt packages download test suite.
4137

4238
env:
4339
COLUMNS: 190
@@ -240,7 +236,7 @@ jobs:
240236
- name: Define workflow config
241237
id: workflow-config
242238
run: |
243-
tools ci workflow-config${{ inputs.skip-salt-test-suite && ' --skip-tests' || '' }}${{ inputs.skip-salt-pkg-test-suite && ' --skip-pkg-tests' || '' }}${{ inputs.skip-salt-pkg-download-test-suite && ' --skip-pkg-download-tests' || '' }} ${{ steps.setup-salt-version.outputs.salt-version }} ${{ github.event_name }} changed-files.json
239+
tools ci workflow-config${{ inputs.skip-salt-test-suite && ' --skip-tests' || '' }}${{ inputs.skip-salt-pkg-test-suite && ' --skip-pkg-tests' || '' }} ${{ steps.setup-salt-version.outputs.salt-version }} ${{ github.event_name }} changed-files.json
244240
245241
- name: Check Contents of generated testrun-changed-files.txt
246242
if: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }}

.github/workflows/templates/staging.yml.jinja

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<%- set prepare_workflow_salt_version_input = "${{ inputs.salt-version }}" %>
33
<%- set prepare_workflow_skip_test_suite = "${{ inputs.skip-salt-test-suite && ' --skip-tests' || '' }}" %>
44
<%- set prepare_workflow_skip_pkg_test_suite = "${{ inputs.skip-salt-pkg-test-suite && ' --skip-pkg-tests' || '' }}" %>
5-
<%- set prepare_workflow_skip_pkg_download_test_suite = "${{ inputs.skip-salt-pkg-download-test-suite && ' --skip-pkg-download-tests' || '' }}" %>
65
<%- set gh_environment = "staging" %>
76
<%- set prepare_actual_release = True %>
87
<%- set skip_test_coverage_check = "true" %>
@@ -46,10 +45,6 @@ on:
4645
type: boolean
4746
default: false
4847
description: Skip running the Salt packages test suite.
49-
skip-salt-pkg-download-test-suite:
50-
type: boolean
51-
default: false
52-
description: Skip running the Salt packages download test suite.
5348

5449
<%- endblock on %>
5550

0 commit comments

Comments
 (0)