Skip to content

Commit b00ceb0

Browse files
ci: avoid harcoding openssl-1.1.1w in install-ruby action
1 parent 617b9aa commit b00ceb0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/actions/install-ruby/action.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ inputs:
44
version:
55
description: 'The version of Ruby to install'
66
required: true
7+
openssl-version:
8+
description: 'The version of OpenSSL used'
9+
required: true
710

811
runs:
912
using: 'composite'
@@ -13,7 +16,7 @@ runs:
1316
uses: actions/cache/restore@v4
1417
with:
1518
path: ~/rubies/ruby-${{ inputs.version }}
16-
key: ruby-${{ inputs.version }}-openssl-1.1.1w
19+
key: ruby-${{ inputs.version }}-${{ inputs.openssl-version }}
1720

1821
- name: Install Ruby
1922
if: steps.cache-ruby-restore.outputs.cache-hit != 'true'
@@ -65,7 +68,7 @@ runs:
6568
GEMFILE: ${{ env.BUNDLE_GEMFILE || 'Gemfile' }}
6669
with:
6770
path: ~/bundler/cache
68-
key: bundler-ruby-${{ inputs.version }}-openssl-1.1.1w-${{ hashFiles(env.Gemfile, 'webauthn.gemspec') }}
71+
key: bundler-ruby-${{ inputs.version }}-${{ inputs.openssl-version }}-${{ hashFiles(env.Gemfile, 'webauthn.gemspec') }}
6972

7073
- name: Install dependencies
7174
shell: bash

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
uses: ./.github/actions/install-ruby
4444
with:
4545
version: ${{ matrix.ruby }}
46+
openssl-version: "1.1.1w"
4647

4748
- name: Set up Ruby
4849
if: matrix.ruby == 'truffleruby'

0 commit comments

Comments
 (0)