Skip to content

Commit 592169b

Browse files
authored
PE-36459 .sync.yml and pdk updated (#370)
* PE-36459 .sync.yml and pdk updated
1 parent 9d77315 commit 592169b

File tree

5 files changed

+49
-46
lines changed

5 files changed

+49
-46
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: "ci"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
workflow_dispatch:
8+
9+
jobs:
10+
Spec:
11+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
12+
secrets: "inherit"
13+
14+
Acceptance:
15+
needs: Spec
16+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
17+
secrets: "inherit"

.github/workflows/nightly.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: "nightly"
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
Spec:
10+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11+
secrets: "inherit"
12+
13+
Acceptance:
14+
needs: Spec
15+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
16+
secrets: "inherit"

.github/workflows/release.yml

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,6 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
create-github-release:
8-
name: Deploy GitHub Release
9-
runs-on: ubuntu-20.04
10-
steps:
11-
- name: Checkout code
12-
uses: actions/checkout@v2
13-
with:
14-
ref: ${{ github.ref }}
15-
clean: true
16-
fetch-depth: 0
17-
- name: Get Version
18-
id: gv
19-
run: |
20-
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
21-
- name: Create Release
22-
uses: actions/create-release@v1
23-
id: create_release
24-
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
with:
27-
tag_name: "v${{ steps.gv.outputs.ver }}"
28-
draft: false
29-
prerelease: false
30-
31-
deploy-forge:
32-
name: Deploy to Forge
33-
runs-on: ubuntu-20.04
34-
steps:
35-
- name: Checkout code
36-
uses: actions/checkout@v2
37-
with:
38-
ref: ${{ github.ref }}
39-
clean: true
40-
- name: "PDK Build"
41-
uses: docker://puppet/pdk:2.6.1.0
42-
with:
43-
args: 'build'
44-
- name: "Push to Forge"
45-
uses: docker://puppet/pdk:2.6.1.0
46-
with:
47-
args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
7+
release:
8+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
9+
secrets: "inherit"

.sync.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,16 @@ spec/spec_helper.rb:
3232
.github/workflows/auto_release.yml:
3333
unmanaged: false
3434
.github/workflows/release.yml:
35-
unmanaged: true
35+
unmanaged: false
3636
.github/workflows/spec.yml:
3737
unmanaged: false
38+
.github/workflows/ci.yml:
39+
unmanaged: false
40+
.github/workflows/nightly.yml:
41+
unmanaged: false
3842
.travis.yml:
3943
delete: true
44+
".gitlab-ci.yml":
45+
delete: true
46+
appveyor.yml:
47+
delete: true

metadata.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
},
3131
{
3232
"name": "puppetlabs/service",
33-
"version_requirement": ">= 1.3.0 < 3.0.0"
33+
"version_requirement": ">= 1.3.0 <= 3.0.0"
3434
},
3535
{
3636
"name": "puppetlabs/package",
37-
"version_requirement": ">= 2.1.0 < 3.0.0"
37+
"version_requirement": ">= 2.1.0 <= 3.0.0"
3838
},
3939
{
4040
"name": "puppetlabs/inifile",
@@ -80,7 +80,7 @@
8080
"version_requirement": ">= 6.0.2 < 9.0.0"
8181
}
8282
],
83-
"pdk-version": "2.7.1",
83+
"pdk-version": "3.0.0",
8484
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
85-
"template-ref": "heads/main-0-g928935d"
85+
"template-ref": "tags/3.0.0-0-g056e50d"
8686
}

0 commit comments

Comments
 (0)