From 87197f3c7c7f611f0cb669848f1799e9e19f607e Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 21 Jun 2024 12:09:16 -0500 Subject: [PATCH] fix: release please configs Signed-off-by: Corey Hemminger --- .github/workflows/{ci.yml => lint.yml} | 32 ++++++++++++-------------- .github/workflows/publish.yaml | 5 +--- .markdownlint.yaml | 8 +++---- .release-please-manifest.json | 3 +++ kitchen.yml | 12 ++++------ release-please-config.json | 12 ++++++++++ 6 files changed, 39 insertions(+), 33 deletions(-) rename .github/workflows/{ci.yml => lint.yml} (73%) create mode 100644 .release-please-manifest.json create mode 100644 release-please-config.json diff --git a/.github/workflows/ci.yml b/.github/workflows/lint.yml similarity index 73% rename from .github/workflows/ci.yml rename to .github/workflows/lint.yml index 4722f33..4d15274 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/lint.yml @@ -1,34 +1,33 @@ --- -name: Lint & Unit +name: 'Lint, Unit & Integration Tests' "on": pull_request: jobs: lint-unit: - uses: test-kitchen/.github/.github/workflows/lint-unit.yml@v0.1.2 + uses: test-kitchen/.github/.github/workflows/lint-unit.yml@main integration-windows: - name: Windows ${{matrix.suite}} ${{matrix.os}} runs-on: windows-latest needs: lint-unit strategy: fail-fast: false matrix: suite: [default] - os: [ubuntu-20.04] + os: [ubuntu-24.04] + ruby: ["3.3"] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.1" + ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} integration-linux: - name: Linux ${{matrix.suite}} ${{matrix.os}} runs-on: ubuntu-latest needs: lint-unit strategy: @@ -41,22 +40,21 @@ jobs: - amd64 - inspec os: - - amazonlinux-2 - - ubuntu-1804 - - ubuntu-2004 + - amazonlinux-2023 + - ubuntu-2204 + - ubuntu-2404 - fedora-latest - - centos-7 - - oraclelinux-7 - - rockylinux-8 - - debian-11 + - almalinux-9 + - rockylinux-9 - debian-12 - opensuse-15 - dockerfile + ruby: ["3.3"] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.1" + ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -65,7 +63,6 @@ jobs: - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }} integration-capabilities: - name: Linux ${{matrix.suite}} ${{matrix.os}} runs-on: ubuntu-latest needs: lint-unit strategy: @@ -73,12 +70,13 @@ jobs: matrix: suite: - capabilities - os: [debian-11, ubuntu-1804, ubuntu-2004] + os: [debian-12, ubuntu-2204, ubuntu-2404] + ruby: ["3.3"] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.1" + ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 37c5e5c..d47a1b2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,12 +9,9 @@ jobs: release-please: runs-on: ubuntu-latest steps: - - uses: google-github-actions/release-please-action@v3 + - uses: googleapis/release-please-action@v4 id: release with: - release-type: ruby - package-name: kitchen-docker - version-file: lib/kitchen/driver/docker_version.rb token: ${{ secrets.PORTER_GITHUB_TOKEN }} - name: Checkout diff --git a/.markdownlint.yaml b/.markdownlint.yaml index 5df560a..9fd2375 100644 --- a/.markdownlint.yaml +++ b/.markdownlint.yaml @@ -1,8 +1,6 @@ +--- default: true +MD004: false +MD012: false MD013: false MD024: false -MD026: false -MD036: false -MD012: false -MD029: false -MD004: false diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..d4f6f29 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "3.0.0" +} diff --git a/kitchen.yml b/kitchen.yml index 94bf41e..9d95c6c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -13,18 +13,16 @@ provisioner: name: dummy platforms: - - name: amazonlinux-2 - - name: ubuntu-18.04 - - name: ubuntu-20.04 + - name: amazonlinux-2023 + - name: ubuntu-22.04 + - name: ubuntu-24.04 - name: fedora-latest driver: provision_command: - yum install libxcrypt-compat -y - curl -L https://www.chef.io/chef/install.sh | bash - - name: centos-7 - - name: oraclelinux-7 - - name: rockylinux-8 - - name: debian-11 + - name: almalinux-9 + - name: rockylinux-9 - name: debian-12 - name: opensuse-15 driver: diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..2cad467 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,12 @@ +{ + "packages": { + ".": { + "package-name": "kitchen-docker", + "changelog-path": "CHANGELOG.md", + "release-type": "ruby", + "include-component-in-tag": false, + "version-file": "lib/kitchen/docker/docker_version.rb" + } + }, + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" +}