Skip to content

Commit 3b1838f

Browse files
authored
Merge pull request #781 from junaruga/wip/revert-openssl-source-file-workaround
Revert "A temporary workaround to download OpenSSL archive files."
2 parents 21aadc6 + b0e4657 commit 3b1838f

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ jobs:
6464
os: [ ubuntu-latest ]
6565
ruby: [ "3.0" ]
6666
openssl:
67+
# https://www.openssl.org/source/
68+
- openssl-1.0.2u # EOL
69+
- openssl-1.1.0l # EOL
70+
- openssl-1.1.1w # EOL
71+
- openssl-3.0.13
72+
- openssl-3.1.5
73+
- openssl-3.2.1
74+
- openssl-3.3.0
6775
# http://www.libressl.org/releases.html
6876
- libressl-3.1.5 # EOL
6977
- libressl-3.2.7 # EOL
@@ -76,19 +84,10 @@ jobs:
7684
- libressl-3.9.1
7785
fips-enabled: [ false ]
7886
include:
79-
# A temporary workaround for OpenSSL source files.
80-
# https://openssl-library.org/source/old/
81-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-1.0.2u, openssl-site-dir: '1.0.2' } # EOL
82-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-1.1.0l, openssl-site-dir: '1.1.0' } # EOL
83-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-1.1.1w, openssl-site-dir: '1.1.1' } # EOL
84-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.0.13, openssl-site-dir: '3.0' }
85-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.1.5, openssl-site-dir: '3.1' }
86-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.2.1, openssl-site-dir: '3.2' }
87-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.3.0, openssl-site-dir: '3.3' }
88-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.0.13, openssl-site-dir: '3.0', fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
89-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.1.5, openssl-site-dir: '3.1', fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
90-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.2.1, openssl-site-dir: '3.2', fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
91-
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.3.0, openssl-site-dir: '3.3', fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
87+
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.0.13, fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
88+
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.1.5, fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
89+
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.2.1, fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
90+
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-3.3.0, fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
9291
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-head, git: 'https://github.com/openssl/openssl.git', branch: 'master' }
9392
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-head, git: 'https://github.com/openssl/openssl.git', branch: 'master', fips-enabled: true, append-configure: 'enable-fips', name-extra: 'fips' }
9493
- { os: ubuntu-latest, ruby: "3.0", openssl: openssl-head, git: 'https://github.com/openssl/openssl.git', branch: 'master', append-configure: 'no-legacy', name-extra: 'no-legacy' }
@@ -104,7 +103,7 @@ jobs:
104103
case ${{ matrix.openssl }} in
105104
openssl-*)
106105
if [ -z "${{ matrix.git }}" ]; then
107-
curl -OL https://openssl.org/source/old/${{ matrix.openssl-site-dir }}/${{ matrix.openssl }}.tar.gz
106+
curl -OL https://openssl.org/source/${{ matrix.openssl }}.tar.gz
108107
tar xf ${{ matrix.openssl }}.tar.gz && cd ${{ matrix.openssl }}
109108
else
110109
git clone -b ${{ matrix.branch }} --depth 1 ${{ matrix.git }} ${{ matrix.openssl }}

0 commit comments

Comments
 (0)