Skip to content

Commit

Permalink
(CONT-807) Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
chelnak committed Apr 19, 2023
1 parent 08aea34 commit cb69b6a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 66 deletions.
34 changes: 0 additions & 34 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,12 @@
name: "ci"

on:
push:
branches:
- "main"
pull_request:
branches:
- "main"
workflow_dispatch:

jobs:

spec:
strategy:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.2'
include:
- ruby_version: '2.7'
puppet_gem_version: '~> 7.0'
- ruby_version: '3.2'
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8
name: "spec (ruby ${{ matrix.ruby_version }} | puppet ${{ matrix.puppet_gem_version }})"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
secrets: "inherit"
with:
ruby_version: ${{ matrix.ruby_version }}
puppet_gem_version: ${{ matrix.puppet_gem_version }}

acceptance:
needs: "spec"
strategy:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.2'
name: "acceptance (ruby ${{ matrix.ruby_version }})"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
secrets: "inherit"
with:
ruby_version: ${{ matrix.ruby_version }}
puppet_version: ${{ matrix.puppet_version }}
31 changes: 0 additions & 31 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,6 @@ on:
workflow_dispatch:

jobs:

spec:
strategy:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.2'
include:
- ruby_version: '2.7'
puppet_gem_version: '~> 7.0'
- ruby_version: '3.2'
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8
name: "spec (ruby ${{ matrix.ruby_version }} | puppet ${{ matrix.puppet_gem_version }})"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
secrets: "inherit"
with:
ruby_version: ${{ matrix.ruby_version }}
puppet_gem_version: ${{ matrix.puppet_gem_version }}

acceptance:
needs: "spec"
strategy:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.2'
name: "acceptance (ruby ${{ matrix.ruby_version }})"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
secrets: "inherit"
with:
ruby_version: ${{ matrix.ruby_version }}
puppet_gem_version: ${{ matrix.puppet_gem_version }}
2 changes: 1 addition & 1 deletion .github/workflows/release_prep.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "release prep"
name: "Release Prep"

on:
workflow_dispatch:
Expand Down

0 comments on commit cb69b6a

Please sign in to comment.