8000 Fix CI failure for Ruby 3.1 by hsbt · Pull Request #10512 · ruby/ruby · GitHub
[go: up one dir, main page]
Skip to content

Fix CI failure for Ruby 3.1 #10512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 15, 2024
Merged

Fix CI failure for Ruby 3.1 #10512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e520144
Try to fix https://github.com/ruby/ruby/actions/runs/8370868368/job/2…
hsbt Apr 12, 2024
1512f76
merge revision(s) 64b6a018a38f200c957fdbbe7d0cbe0e64781c9f:
nagachika Mar 21, 2024
8501fcf
Skip c99 and c2x compilers because Ruby 3.1 couldn't build openssl ge…
hsbt Apr 12, 2024
e13280b
[MSWin] Install libffi using vcpkg
nobu Jan 13, 2022
2dba759
We no longer use Cirrus CI
hsbt Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ environment:
- build: vs
vs: 120
ssl: OpenSSL
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
GEMS_FOR_TEST: ""
- build: vs
vs: 140
ssl: OpenSSL-v111
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
GEMS_FOR_TEST: ""
RELINE_TEST_ENCODING: "UTF-8"
cache:
- c:\Tools\vcpkg\installed\
for:
-
matrix:
Expand All @@ -41,6 +43,12 @@ for:
- SET BITS=%Platform:x86=32%
- SET BITS=%BITS:x=%
- SET OPENSSL_DIR=C:\%ssl%-Win%BITS%
- cd C:\Tools\vcpkg
- git pull -q
- .\bootstrap-vcpkg.bat
- cd %APPVEYOR_BUILD_FOLDER%
- vcpkg --triplet %Platform%-windows install libffi libyaml zlib
- set PATH=c:\Tools\vcpkg\installed\%Platform%-windows\bin;%PATH%
- CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
- SET vcvars
- '"%vcvars%" %Platform:x64=amd64%'
Expand Down Expand Up @@ -69,7 +77,7 @@ for:
- >-
..\win32\configure.bat
--without-ext=+,dbm,gdbm,readline
--with-opt-dir=/usr/local
--with-opt-dir="/usr/local;c:/Tools/vcpkg/installed/%Platform%-windows"
--with-openssl-dir=%OPENSSL_DIR:\=/%
- nmake -l
- nmake install-nodoc
Expand Down
64 changes: 0 additions & 64 deletions .cirrus.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/compilers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ jobs:
- { key: crosshost, name: s390x-linux-gnu, value: s390x-linux-gnu, container: crossbuild-essential-s390x }
- { key: crosshost, name: x86_64-w64-mingw32, value: x86_64-w64-mingw32, container: mingw-w64 }

- { key: append_cc, name: c99, value: '-std=c99 -Werror=pedantic -pedantic-errors' }
# - { key: append_cc, name: c99, value: '-std=c99 -Werror=pedantic -pedantic-errors' }
# - { key: append_cc, name: c11, value: '-std=c11 -Werror=pedantic -pedantic-errors' }
# - { key: append_cc, name: c17, value: '-std=c17 -Werror=pedantic -pedantic-errors' }
- { key: append_cc, name: c2x, value: '-std=c2x -Werror=pedantic -pedantic-errors' }
# - { key: append_cc, name: c2x, value: '-std=c2x -Werror=pedantic -pedantic-errors' }
- { key: CXXFLAGS, name: c++98, value: '-std=c++98 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
# - { key: CXXFLAGS, name: c++11, value: '-std=c++11 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
# - { key: CXXFLAGS, name: c++14, value: '-std=c++14 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mingw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,16 @@ jobs:
timeout-minutes: 5
run: |
make test
shell: cmd

- name: test-all
timeout-minutes: 45
run: |
# Actions uses UTF8, causes test failures, similar to normal OS setup
chcp.com 437
make test-all
env:
RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --retry --job-status=normal --show-skip --timeout-scale=1.5
BUNDLER_VERSION:
shell: cmd

- name: test-spec
timeout-minutes: 10
Expand Down
2 changes: 1 addition & 1 deletion test/net/http/test_https.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def test_session_reuse
def test_session_reuse_but_expire
# FIXME: The new_session_cb is known broken for clients in OpenSSL 1.1.0h.
omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 1.1.0h')
omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 3.2.0')
omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 3.2.')

http = Net::HTTP.new(HOST, config("port"))
http.use_ssl = true
Expand Down
0