Skip to content

Commit 2b8f2c6

Browse files
authored
Merge pull request #340 from puppetlabs/CONT-232-add_reusable_workflow
(CONT-232) - Add version input to gem_release_prep.yml
2 parents 5446729 + 7fe1173 commit 2b8f2c6

File tree

4 files changed

+30
-38
lines changed

4 files changed

+30
-38
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: "ci"
22

33
on:
4-
push:
5-
branches:
6-
- "main"
7-
pull_request:
8-
branches:
9-
- "main"
104
schedule:
115
- cron: "0 0 * * *"
126
workflow_dispatch:
@@ -27,4 +21,4 @@ jobs:
2721
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
2822
secrets: "inherit"
2923
with:
30-
target: ${{ matrix.target }}
24+
puppet_version: ${{ matrix.puppet }}

.github/workflows/nightly.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: "ci"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
workflow_dispatch:
8+
9+
jobs:
10+
11+
spec:
12+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
13+
secrets: "inherit"
14+
15+
acceptance:
16+
needs: "spec"
17+
strategy:
18+
matrix:
19+
puppet:
20+
- "puppet6"
21+
- "puppet7"
22+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
23+
secrets: "inherit"
24+
with:
25+
puppet_version: ${{ matrix.puppet }}

.github/workflows/release_prep.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ on:
77
description: "The target for the release. This can be a commit sha or a branch."
88
required: false
99
default: "main"
10+
version:
11+
description: "Version of gem to be released."
12+
required: true
1013

1114
jobs:
1215
release_prep:
1316
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_release_prep.yml@main"
1417
with:
1518
target: "${{ github.event.inputs.target }}"
19+
version: "${{ github.event.inputs.version }}"
1620
secrets: "inherit"

.github/workflows/snyk.yml

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

0 commit comments

Comments
 (0)