Skip to content

Commit

Permalink
Merge pull request #81 from jordiprats/master
Browse files Browse the repository at this point in the history
ubuntu 20 support
  • Loading branch information
jordiprats authored Jun 4, 2020
2 parents 479733c + bc9d17c commit 8c37361
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 2 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/puppet-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: puppet-lint

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Set up Ruby
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# change this to (see https://github.com/ruby/setup-ruby#versioning):
# uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
with:
ruby-version: 2.6

- name: Install dependencies
run: bundle install

- name: Run tests
run: bundle exec rake

# Runs a single command using the runners shell
- name: puppet-lint
run: bundle exec rake lint
39 changes: 39 additions & 0 deletions .github/workflows/puppet-metadata-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: puppet-metadata-lint

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Set up Ruby
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# change this to (see https://github.com/ruby/setup-ruby#versioning):
# uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
with:
ruby-version: 2.6

- name: Install dependencies
run: bundle install

- name: Run tests
run: bundle exec rake

# Runs a single command using the runners shell
- name: puppet-lint
run: bundle exec rake metadata_lint
39 changes: 39 additions & 0 deletions .github/workflows/puppet-validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: puppet-validate

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Set up Ruby
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# change this to (see https://github.com/ruby/setup-ruby#versioning):
# uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
with:
ruby-version: 2.6

- name: Install dependencies
run: bundle install

- name: Run tests
run: bundle exec rake

# Runs a single command using the runners shell
- name: puppet-lint
run: bundle exec rake validate
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 0.2.43

* added **Ubuntu 20.04** support

## 0.2.42

* setting sha256 as default digest for self signed certificates
Expand Down
6 changes: 6 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@
$postfix_ver='3.3.0'
$compatibility_level_default=2
}
/^20.*$/:
{
$daemon_directory_default='/usr/lib/postfix/sbin'
$postfix_ver='3.4.10'
$compatibility_level_default=2
}
default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}") }
}
}
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eyp-postfix",
"version": "0.2.42",
"version": "0.2.43",
"author": "eyp",
"summary": "postfix management - relay or multidomain mailserver",
"license": "Apache-2.0",
Expand Down Expand Up @@ -36,7 +36,7 @@
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "14.04", "16.04", "18.04" ]
"operatingsystemrelease": [ "14.04", "16.04", "18.04", "20.04" ]
},
{
"operatingsystem": "SLES",
Expand Down

0 comments on commit 8c37361

Please sign in to comment.