Skip to content

Commit

Permalink
Merge pull request #408 from puppetlabs/workflows
Browse files Browse the repository at this point in the history
Target release-any-tag workflows
  • Loading branch information
bastelfreak committed May 7, 2024
2 parents f9b7f7f + c24e65c commit dc991dc
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 37 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ on:
- "main"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Spec:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@release-any-tag"
secrets: "inherit"

Acceptance:
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@release-any-tag"
secrets: "inherit"
with:
runs_on: "ubuntu-20.04"
28 changes: 0 additions & 28 deletions .github/workflows/labeller.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/mend.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: "mend"

on:
Expand All @@ -11,6 +10,7 @@ on:
workflow_dispatch:

jobs:

mend:
uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@release-any-tag"
secrets: "inherit"
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:

jobs:
Spec:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@release-any-tag"
secrets: "inherit"

Acceptance:
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@release-any-tag"
secrets: "inherit"
with:
runs_on: "ubuntu-20.04"
28 changes: 27 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
name: "Publish module"
run-name: >
${{ format('tag={0}', inputs.tag) }}
${{ format('release={0}', inputs.release) }}
${{ format('publish={0}', inputs.publish) }}
${{ format('edit={0}', inputs.edit) }}
on:
workflow_dispatch:
inputs:
tag:
description: "Enter an old tag, or blank to tag HEAD of branch"
type: string
release:
description: "Create a Github release"
type: boolean
default: true
publish:
description: "Publish to the Forge"
type: boolean
default: true
edit:
description: "Re-tag and regenerate release notes"
type: boolean
default: false

jobs:
release:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@release-any-tag"
secrets: "inherit"
with:
tag: ${{ inputs.tag }}
release: ${{ inputs.release }}
publish: ${{ inputs.publish }}
edit: ${{ inputs.edit }}
2 changes: 1 addition & 1 deletion .github/workflows/release_prep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
release_prep:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@release-any-tag"
with:
version: "${{ github.event.inputs.version }}"
secrets: "inherit"
9 changes: 9 additions & 0 deletions .github/workflows/release_without.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: "Publish module without"

on:
workflow_dispatch:

jobs:
release:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@release-any-tag"
secrets: "inherit"
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @puppetlabs/puppetdb @bastelfreak @smortex
* @puppetlabs/puppetdb @bastelfreak @smortex @h0tw1r3

0 comments on commit dc991dc

Please sign in to comment.