Skip to content

Commit dc991dc

Browse files
authored
Merge pull request #408 from puppetlabs/workflows
Target release-any-tag workflows
2 parents f9b7f7f + c24e65c commit dc991dc

File tree

8 files changed

+48
-37
lines changed

8 files changed

+48
-37
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ on:
77
- "main"
88
workflow_dispatch:
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
1115
Spec:
12-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
16+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@release-any-tag"
1317
secrets: "inherit"
1418

1519
Acceptance:
1620
needs: Spec
17-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
21+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@release-any-tag"
1822
secrets: "inherit"
1923
with:
2024
runs_on: "ubuntu-20.04"

.github/workflows/labeller.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/mend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: "mend"
32

43
on:
@@ -11,6 +10,7 @@ on:
1110
workflow_dispatch:
1211

1312
jobs:
13+
1414
mend:
15-
uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main"
15+
uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@release-any-tag"
1616
secrets: "inherit"

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88

99
jobs:
1010
Spec:
11-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@release-any-tag"
1212
secrets: "inherit"
1313

1414
Acceptance:
1515
needs: Spec
16-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
16+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@release-any-tag"
1717
secrets: "inherit"
1818
with:
1919
runs_on: "ubuntu-20.04"

.github/workflows/release.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
11
name: "Publish module"
2+
run-name: >
3+
${{ format('tag={0}', inputs.tag) }}
4+
${{ format('release={0}', inputs.release) }}
5+
${{ format('publish={0}', inputs.publish) }}
6+
${{ format('edit={0}', inputs.edit) }}
27
38
on:
49
workflow_dispatch:
10+
inputs:
11+
tag:
12+
description: "Enter an old tag, or blank to tag HEAD of branch"
13+
type: string
14+
release:
15+
description: "Create a Github release"
16+
type: boolean
17+
default: true
18+
publish:
19+
description: "Publish to the Forge"
20+
type: boolean
21+
default: true
22+
edit:
23+
description: "Re-tag and regenerate release notes"
24+
type: boolean
25+
default: false
526

627
jobs:
728
release:
8-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
29+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@release-any-tag"
930
secrets: "inherit"
31+
with:
32+
tag: ${{ inputs.tag }}
33+
release: ${{ inputs.release }}
34+
publish: ${{ inputs.publish }}
35+
edit: ${{ inputs.edit }}

.github/workflows/release_prep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
release_prep:
12-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
12+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@release-any-tag"
1313
with:
1414
version: "${{ github.event.inputs.version }}"
1515
secrets: "inherit"

.github/workflows/release_without.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: "Publish module without"
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
release:
8+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@release-any-tag"
9+
secrets: "inherit"

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @puppetlabs/puppetdb @bastelfreak @smortex
1+
* @puppetlabs/puppetdb @bastelfreak @smortex @h0tw1r3

0 commit comments

Comments
 (0)