Skip to content

Commit 79786ca

Browse files
committed
CI: Rename the key name "foo_bar" (underscore) to "foo-bar" (hyphen).
GitHub Action YAML config file's key names are a style with the "foo-bar" (hyphen). This commit is to rename the key names with "foo_bar" (underscore) to "foo-bar" (hyphen) for consistency. * Replaced "fips_enabled" with "fips-enabled". * Replaced "append_configure" with "append-configure". * Replaced "name_extra" with "name-extra".
1 parent 7e411b4 commit 79786ca

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
test-openssls:
5858
name: >-
59-
${{ matrix.openssl }} ${{ matrix.name_extra || '' }}
59+
${{ matrix.openssl }} ${{ matrix.name-extra || '' }}
6060
runs-on: ${{ matrix.os }}
6161
strategy:
6262
fail-fast: false
@@ -75,9 +75,9 @@ jobs:
7575
- libressl-3.5.3
7676
- libressl-3.6.1
7777
- libressl-3.7.0 # Development release
78-
fips_enabled: [ false ]
78+
fips-enabled: [ false ]
7979
include:
80-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.0.8, fips_enabled: true, append_configure: 'enable-fips', name_extra: 'fips' }
80+
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.0.8, fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
8181
steps:
8282
- name: repo checkout
8383
uses: actions/checkout@v3
@@ -91,7 +91,7 @@ jobs:
9191
tar xf ${{ matrix.openssl }}.tar.gz && cd ${{ matrix.openssl }}
9292
# shared is required for 1.0.x.
9393
./Configure --prefix=$HOME/.openssl/${{ matrix.openssl }} --libdir=lib \
94-
shared linux-x86_64 ${{ matrix.append_configure }}
94+
shared linux-x86_64 ${{ matrix.append-configure }}
9595
make depend
9696
;;
9797
libressl-*)
@@ -109,22 +109,22 @@ jobs:
109109
- name: prepare openssl fips
110110
run: make install_fips
111111
working-directory: tmp/build-openssl/${{ matrix.openssl }}
112-
if: matrix.fips_enabled
112+
if: matrix.fips-enabled
113113

114114
- name: set the open installed directory
115115
run: >
116116
sed -e "s|OPENSSL_DIR|$HOME/.openssl/${{ matrix.openssl }}|"
117117
test/openssl/fixtures/ssl/openssl_fips.cnf.tmpl >
118118
test/openssl/fixtures/ssl/openssl_fips.cnf
119-
if: matrix.fips_enabled
119+
if: matrix.fips-enabled
120120

121121
- name: set openssl config file path for fips.
122122
run: echo "OPENSSL_CONF=$(pwd)/test/openssl/fixtures/ssl/openssl_fips.cnf" >> $GITHUB_ENV
123-
if: matrix.fips_enabled
123+
if: matrix.fips-enabled
124124

125125
- name: set fips enviornment variable for testing.
126126
run: echo "TEST_RUBY_OPENSSL_FIPS_ENABLED=true" >> $GITHUB_ENV
127-
if: matrix.fips_enabled
127+
if: matrix.fips-enabled
128128

129129
- name: load ruby
130130
uses: ruby/setup-ruby@v1
@@ -144,12 +144,12 @@ jobs:
144144
- name: test
145145
run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
146146
timeout-minutes: 5
147-
if: ${{ !matrix.fips_enabled }}
147+
if: ${{ !matrix.fips-enabled }}
148148

149149
# Run only the passing tests on the FIPS mode as a temporary workaround.
150150
# TODO Fix other tests, and run all the tests on FIPS mode.
151151
- name: test on fips mode
152152
run: |
153153
ruby -I./lib -ropenssl \
154154
-e 'Dir.glob "./test/openssl/{test_fips.rb,test_pkey.rb}", &method(:require)'
155-
if: matrix.fips_enabled
155+
if: matrix.fips-enabled

0 commit comments

Comments
 (0)