Skip to content

Commit 8fa906c

Browse files
committed
(maint) update workflows
1 parent 45c6d4a commit 8fa906c

File tree

5 files changed

+48
-27
lines changed

5 files changed

+48
-27
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
name: "ci"
1+
name: "CI"
22

33
on:
44
pull_request:
55
branches:
66
- "main"
77
workflow_dispatch:
8-
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
Spec:
1115
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
@@ -17,3 +21,5 @@ jobs:
1721
secrets: "inherit"
1822
with:
1923
runs_on: ubuntu-20.04
24+
kernel_modules: false
25+
disable_apparmor: true

.github/workflows/labeller.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,12 @@ name: Labeller
22

33
on:
44
issues:
5-
types:
6-
- opened
7-
- labeled
8-
- unlabeled
5+
types: [ opened, reopened, labeled, unlabeled ]
96
pull_request_target:
10-
types:
11-
- opened
12-
- labeled
13-
- unlabeled
7+
types: [ opened, reopened, labeled, unlabeled ]
148

159
jobs:
1610
label:
17-
runs-on: ubuntu-latest
18-
steps:
19-
20-
- uses: puppetlabs/community-labeller@v1.0.1
21-
name: Label issues or pull requests
22-
with:
23-
label_name: community
24-
label_color: '5319e7'
25-
org_membership: puppetlabs
26-
fail_if_member: 'true'
27-
token: ${{ secrets.IAC_COMMUNITY_LABELER }}
11+
if: contains(fromJson('["puppetlabs", "puppet-toy-chest"]'), github.repository_owner)
12+
uses: "puppetlabs/cat-github-actions/.github/workflows/labeller.yml@main"
13+
secrets: inherit

.github/workflows/release.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,36 @@
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:
5-
10+
inputs:
11+
tag:
12+
description: "Leave blank to tag HEAD of branch, or existing tag to edit"
13+
default: ''
14+
type: string
15+
release:
16+
description: "Create a Github release"
17+
type: boolean
18+
default: true
19+
publish:
20+
description: "Publish to the Forge"
21+
type: boolean
22+
default: true
23+
edit:
24+
description: "Regenerate release notes and existing tag"
25+
default: false
26+
type: boolean
27+
628
jobs:
7-
release:
29+
release:
830
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
931
secrets: "inherit"
32+
with:
33+
tag: ${{ inputs.tag }}
34+
release: ${{ inputs.release }}
35+
publish: ${{ inputs.publish }}
36+
edit: ${{ inputs.edit }}

.github/workflows/release_prep.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: "Release Prep"
2+
run-name: >
3+
version=${{ inputs.version }}
24
35
on:
46
workflow_dispatch:
@@ -11,5 +13,5 @@ jobs:
1113
release_prep:
1214
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
1315
with:
14-
version: "${{ github.event.inputs.version }}"
16+
version: "${{ inputs.version }}"
1517
secrets: "inherit"

.sync.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ spec/spec_helper.rb:
1111
.github/workflows/ci.yml:
1212
unmanaged: true
1313
.github/workflows/nightly.yml:
14-
unmanaged: false
14+
unmanaged: true
1515
.github/workflows/release_prep.yml:
16-
unmanaged: false
16+
unmanaged: true
1717
.github/workflows/release.yml:
18-
unmanaged: false
18+
unmanaged: true
1919

2020
Rakefile:
2121
changelog_since_tag: 'v11.0.3'

0 commit comments

Comments
 (0)