diff --git a/.github/workflows/exec.yml b/.github/workflows/exec.yml index 49a505792..cf56577f6 100644 --- a/.github/workflows/exec.yml +++ b/.github/workflows/exec.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: ['macos-latest', 'ubuntu-latest', 'windows-latest'] - ruby: ['2.7', '3.0'] + ruby: ['3.0'] name: Exec Ohai on ${{ matrix.os }} with Ruby ${{ matrix.ruby }} runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 80173c7b4..332e1bbe2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.0 bundler-cache: true - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR - run: bundle exec chefstyle diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 5d4b02eb0..519f396fc 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] - ruby: ['2.7', '3.0'] + ruby: ['3.0'] name: Unit test on ${{ matrix.os }} with Ruby ${{ matrix.ruby }} runs-on: ${{ matrix.os }} steps: diff --git a/ohai.gemspec b/ohai.gemspec index 6b0aba3cf..cf0f9507b 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.add_dependency "chef-config", ">= 14.12", "< 18" s.add_dependency "chef-utils", ">= 16.0", "< 18" - s.add_dependency "ffi" + s.add_dependency "ffi", "~> 1.9", "< 1.16.0" s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "ipaddress" s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options