diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1509f6e..76cf31c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,47 +1,47 @@ name: "Publish module" on: workflow_dispatch: jobs: create-github-release: name: Deploy GitHub Release runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v2 with: ref: ${{ github.ref }} clean: true fetch-depth: 0 - name: Get Version id: gv run: | echo "::set-output name=ver::$(jq --raw-output .version metadata.json)" - name: Create Release uses: actions/create-release@v1 id: create_release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: "v${{ steps.gv.outputs.ver }}" draft: false prerelease: false deploy-forge: name: Deploy to Forge runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v2 with: ref: ${{ github.ref }} clean: true - name: "PDK Build" - uses: docker://puppet/pdk:nightly + uses: docker://puppet/pdk:2.1.0.0 with: args: 'build' - name: "Push to Forge" - uses: docker://puppet/pdk:nightly + uses: docker://puppet/pdk:2.1.0.0 with: args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force' diff --git a/.gitignore b/.gitignore index 2767022..988dcbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,28 @@ .git/ .*.sw[op] .metadata .yardoc .yardwarns *.iml /.bundle/ /.idea/ /.vagrant/ /coverage/ /bin/ /doc/ /Gemfile.local /Gemfile.lock /junit/ /log/ /pkg/ /spec/fixtures/manifests/ /spec/fixtures/modules/ /tmp/ /vendor/ /convert_report.txt /update_report.txt .DS_Store .project .envrc /inventory.yaml +/spec/fixtures/litmus_inventory.yaml diff --git a/.pdkignore b/.pdkignore index a74c4c4..33a1347 100644 --- a/.pdkignore +++ b/.pdkignore @@ -1,45 +1,46 @@ .git/ .*.sw[op] .metadata .yardoc .yardwarns *.iml /.bundle/ /.idea/ /.vagrant/ /coverage/ /bin/ /doc/ /Gemfile.local /Gemfile.lock /junit/ /log/ /pkg/ /spec/fixtures/manifests/ /spec/fixtures/modules/ /tmp/ /vendor/ /convert_report.txt /update_report.txt .DS_Store .project .envrc /inventory.yaml +/spec/fixtures/litmus_inventory.yaml /appveyor.yml /.fixtures.yml /Gemfile /.gitattributes /.gitignore /.gitlab-ci.yml /.pdkignore /.puppet-lint.rc /Rakefile /rakelib/ /.rspec /.rubocop.yml /.travis.yml /.yardopts /spec/ /.vscode/ /.sync.yml /.devcontainer/ diff --git a/metadata.json b/metadata.json index b996d10..cda400f 100644 --- a/metadata.json +++ b/metadata.json @@ -1,69 +1,69 @@ { "name": "puppetlabs-docker", "version": "4.0.0", "author": "puppetlabs", "summary": "Module for installing and managing docker", "license": "Apache-2.0", "source": "git://github.com/puppetlabs/puppetlabs-docker", "project_page": "https://github.com/puppetlabs/puppetlabs-docker", "issues_url": "https://github.com/puppetlabs/puppetlabs-docker/issues", "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.24.0 < 8.0.0" }, { "name": "puppetlabs/apt", "version_requirement": ">= 4.4.1 < 9.0.0" }, { "name": "puppetlabs/powershell", "version_requirement": ">= 2.1.4 < 6.0.0" }, { "name": "puppetlabs/reboot", "version_requirement": ">=2.0.0 < 5.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", "16.04", "18.04", "20.04" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "8", "9", "10" ] }, { "operatingsystem": "Windows", "operatingsystemrelease": [ "2016", "2019" ] } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 6.0.0 < 8.0.0" } ], - "pdk-version": "1.19.0.pre", + "pdk-version": "2.0.0", "template-url": "https://github.com/puppetlabs/pdk-templates.git#main", - "template-ref": "heads/main-0-gce6a88f" + "template-ref": "heads/main-0-ge04486b" }