diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 90d6dfd..1afdd73 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,19 +1,13 @@ version: 2 updates: -- package-ecosystem: bundler - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 - -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 + - package-ecosystem: bundler + directory: "/" + schedule: + interval: weekly + open-pull-requests-limit: 10 diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml deleted file mode 100644 index 19380e9..0000000 --- a/.github/workflows/auto_release_prep.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Automated release prep - -on: - workflow_dispatch: - -jobs: - auto_release_prep: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1 - secrets: inherit - with: - project-type: ruby - version-file-path: lib/vmfloaty/version.rb diff --git a/.github/workflows/dependabot_merge.yml b/.github/workflows/dependabot_merge.yml deleted file mode 100644 index 75b9cea..0000000 --- a/.github/workflows/dependabot_merge.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Dependabot auto-merge - -on: pull_request - -jobs: - dependabot_merge: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1 - secrets: inherit diff --git a/.github/workflows/ensure_label.yml b/.github/workflows/ensure_label.yml deleted file mode 100644 index 50a5fa8..0000000 --- a/.github/workflows/ensure_label.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Ensure label - -on: pull_request - -jobs: - ensure_label: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/ensure_label.yml@v1 - secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d79ed5f..5c10569 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: ref: ${{ github.ref }} clean: true @@ -29,7 +29,7 @@ jobs: echo "Found version $version from lib/vmfloaty/version.rb" - name: Get Current Version - uses: actions/github-script@v7 + uses: actions/github-script@v6 id: cv with: script: | @@ -82,17 +82,17 @@ jobs: prerelease: false - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v2 - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v4 with: push: true tags: | diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index ba273f5..666c602 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout repo content - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: setup ruby @@ -22,7 +22,7 @@ jobs: - name: check lock run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock' # install java - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: distribution: 'temurin' # See 'Supported distributions' for available options java-version: '17' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8562713..4b9576f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - '3.2' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - 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): diff --git a/Dockerfile b/Dockerfile index 5c8fd0e..5c3a5e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.5-slim-bullseye +FROM ruby:3.2.2-slim-bullseye LABEL org.opencontainers.image.authors="@puppetlabs/release-engineering" LABEL org.opencontainers.image.title="vmfloaty" diff --git a/Gemfile b/Gemfile index 7f70b2e..856b39c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,11 +8,11 @@ gem 'rake', require: false group :test do gem 'simplecov', '~> 0.22.0' - gem 'simplecov-html', '~> 0.13.1' + gem 'simplecov-html', '~> 0.12.3' gem 'simplecov-lcov', '~> 0.8.0' gem 'pry' gem 'rb-readline' - gem 'rspec', '~> 3.13.0' - gem 'rubocop', '~> 1.66' - gem 'webmock', '~> 3.23' + gem 'rspec', '~> 3.12.0' + gem 'rubocop', '~> 1.55' + gem 'webmock', '~> 3.13' end diff --git a/Gemfile.lock b/Gemfile.lock index 7d27ddd..11f156f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,17 +8,15 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) + addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - bigdecimal (3.1.8) coderay (1.1.3) commander (4.6.0) highline (~> 2.0.0) - crack (1.0.0) - bigdecimal + crack (0.4.5) rexml - diff-lcs (1.5.1) + diff-lcs (1.5.0) docile (1.4.0) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -43,64 +41,63 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - hashdiff (1.1.0) + hashdiff (1.0.1) highline (2.0.3) - json (2.7.2) + json (2.6.3) language_server-protocol (3.17.0.3) method_source (1.0.0) multipart-post (2.3.0) - parallel (1.26.3) - parser (3.3.5.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) racc pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.5) - racc (1.8.1) + public_suffix (5.0.1) + racc (1.7.1) rainbow (3.1.1) - rake (13.2.1) + rake (13.0.6) rb-readline (0.5.5) - regexp_parser (2.9.2) - rexml (3.3.6) - strscan - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + regexp_parser (2.8.1) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.0) - rubocop (1.66.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rubocop (1.55.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.3.0.2) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) - parser (>= 3.3.1.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.13.1) + simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - strscan (3.1.0) - unicode-display_width (2.5.0) - webmock (3.23.1) + unicode-display_width (2.4.2) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -113,13 +110,13 @@ DEPENDENCIES pry rake rb-readline - rspec (~> 3.13.0) - rubocop (~> 1.66) + rspec (~> 3.12.0) + rubocop (~> 1.55) simplecov (~> 0.22.0) - simplecov-html (~> 0.13.1) + simplecov-html (~> 0.12.3) simplecov-lcov (~> 0.8.0) vmfloaty! - webmock (~> 3.23) + webmock (~> 3.13) BUNDLED WITH 2.4.8 diff --git a/release-prep b/release-prep index 82ee104..d5bbb83 100755 --- a/release-prep +++ b/release-prep @@ -1,12 +1,12 @@ #!/usr/bin/env bash # bundle install -docker run -t --rm \ +docker run -it --rm \ -v $(pwd):/app \ $(grep ^FROM ./Dockerfile |cut -d ' ' -f2) \ /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends build-essential make openssh-client && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' # Update Changelog -docker run -t --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ +docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ githubchangeloggenerator/github-changelog-generator:1.16.2 \ github_changelog_generator --future-release $(grep VERSION lib/vmfloaty/version.rb |rev |cut -d "'" -f2 |rev)