Showing with 118 additions and 21 deletions.
  1. +47 −0 .github/workflows/cron.yml
  2. +44 −0 .github/workflows/unit.yml
  3. +3 −0 .sync.yml
  4. +0 −12 .travis.yml
  5. +8 −0 CHANGELOG.md
  6. +9 −8 Gemfile
  7. +6 −0 manifests/repo.pp
  8. +1 −1 metadata.json
47 changes: 47 additions & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Nightly tests

on:
schedule:
- cron: '4 4 * * *'

jobs:
unit:
if: github.repository == 'theforeman/puppet-git'
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby:
- "2.5"
- "2.4"
puppet:
- "6"
- "5"
exclude:
- ruby: "2.5"
puppet: "5"
- ruby: "2.4"
puppet: "6"
env:
PUPPET_VERSION: "${{ matrix.puppet }}.0"
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-${{ matrix.puppet }}-${{ matrix.ruby }}-gems-unit-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-${{ matrix.puppet }}-${{ matrix.ruby }}-gems-unit-
- name: Install dependencies
run: |
gem install bundler
bundle config path vendor/bundle
bundle config without 'development system_tests'
bundle install --jobs 4 --retry 3
- name: Run tests
run: bundle exec rake
44 changes: 44 additions & 0 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Unit tests

on: pull_request

jobs:
unit:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby:
- "2.5"
- "2.4"
puppet:
- "6"
- "5"
exclude:
- ruby: "2.5"
puppet: "5"
- ruby: "2.4"
puppet: "6"
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
env:
PUPPET_VERSION: "${{ matrix.puppet }}.0"
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-${{ matrix.puppet }}-${{ matrix.ruby }}-gems-unit-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-${{ matrix.puppet }}-${{ matrix.ruby }}-gems-unit-
- name: Install dependencies
run: |
gem install bundler
bundle config path vendor/bundle
bundle config without 'development system_tests'
bundle install --jobs 4 --retry 3
- name: Run tests
run: bundle exec rake
3 changes: 3 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
.github/workflows/acceptance.yml:
delete: true
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [6.2.0](https://github.com/theforeman/puppet-git/tree/6.2.0) (2021-01-26)

[Full Changelog](https://github.com/theforeman/puppet-git/compare/6.1.0...6.2.0)

**Implemented enhancements:**

- New Parameter "Timeout" for Git-Command [\#71](https://github.com/theforeman/puppet-git/pull/71) ([cocker-cc](https://github.com/cocker-cc))

## [6.1.0](https://github.com/theforeman/puppet-git/tree/6.1.0) (2020-05-12)

[Full Changelog](https://github.com/theforeman/puppet-git/compare/6.0.2...6.1.0)
Expand Down
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@

source 'https://rubygems.org'

gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5'
gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5', groups: ['development', 'test']
gem 'rake'

gem 'kafo_module_lint'
gem 'puppet-lint-empty_string-check'
gem 'puppet-lint-file_ensure-check'
gem 'puppet-lint-param-docs', '>= 1.3.0'
gem 'puppet-lint-spaceship_operator_without_tag-check'
gem 'puppet-lint-strict_indent-check'
gem 'puppet-lint-undef_in_function-check'
gem 'kafo_module_lint', {"groups"=>["test"]}
gem 'puppet-lint-empty_string-check', {"groups"=>["test"]}
gem 'puppet-lint-file_ensure-check', {"groups"=>["test"]}
gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
gem 'voxpupuli-test', '~> 1.4'
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
Expand Down
6 changes: 6 additions & 0 deletions manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
# @param args
# Optional arguments to the git command
#
# @param timeout
# Optional Timeout in Seconds for the Git-Command to execute.
# Puppet's "exec" defaults to 300 Seconds
#
# @param bin
# Git binary
#
Expand All @@ -43,6 +47,7 @@
String $mode = '0755',
Stdlib::Absolutepath $workdir = '/tmp',
Optional[String] $args = undef,
Optional[Integer] $timeout = undef,
String $bin = $git::bin,
) {
require git
Expand Down Expand Up @@ -73,6 +78,7 @@
command => $cmd,
creates => $creates,
cwd => $workdir,
timeout => $timeout,
user => $user,
}
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-git",
"version": "6.1.0",
"version": "6.2.0",
"author": "theforeman",
"summary": "git installation and configuration",
"license": "GPL-3.0+",
Expand Down