From 6076c16bcf5b6ca2543a853cb91ed64db559ebb6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 1 Oct 2024 16:52:34 +0900 Subject: [PATCH] Pass MSPECOPT from compilers.yml --- .github/actions/compilers/action.yml | 7 +++++++ .github/actions/compilers/entrypoint.sh | 2 +- .github/workflows/compilers.yml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/actions/compilers/action.yml b/.github/actions/compilers/action.yml index ecb8e4f485168b..c70c6a9559872f 100644 --- a/.github/actions/compilers/action.yml +++ b/.github/actions/compilers/action.yml @@ -59,6 +59,12 @@ inputs: default: '' description: >- Whether to run `make check` + + mspecopt: + required: false + default: '' + description: >- + Additional options for mspec. static_exts: required: false @@ -89,6 +95,7 @@ runs: --env INPUT_CPPFLAGS='${{ inputs.cppflags }}' --env INPUT_APPEND_CONFIGURE='${{ inputs.append_configure }}' --env INPUT_CHECK='${{ inputs.check }}' + --env INPUT_MSPECOPT='${{ inputs.mspecopt }}' --env INPUT_ENABLE_SHARED='${{ inputs.enable_shared }}' --env INPUT_STATIC_EXTS='${{ inputs.static_exts }}' 'ghcr.io/ruby/ruby-ci-image:${{ inputs.tag }}' diff --git a/.github/actions/compilers/entrypoint.sh b/.github/actions/compilers/entrypoint.sh index 0a11ef9cc11376..198ac0e1746da6 100755 --- a/.github/actions/compilers/entrypoint.sh +++ b/.github/actions/compilers/entrypoint.sh @@ -93,4 +93,4 @@ fi grouped make install grouped make test-tool grouped make test-all TESTS="-- $tests" -grouped env CHECK_LEAKS=true make test-spec +grouped env CHECK_LEAKS=true make test-spec MSPECOPT="$INPUT_MSPECOPT" diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index 692c15cc42f2be..a3b3322591210a 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -193,7 +193,7 @@ jobs: - { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true } } - { uses: './.github/actions/compilers', name: '-O0', with: { optflags: '-O0 -march=x86-64 -mtune=generic' } } # - { uses: './.github/actions/compilers', name: '-O3', with: { optflags: '-O3 -march=x86-64 -mtune=generic', check: true } } - - { uses: './.github/actions/compilers', name: 'gmp', with: { append_configure: '--with-gmp', check: 'ruby/test_bignum.rb' } } + - { uses: './.github/actions/compilers', name: 'gmp', with: { append_configure: '--with-gmp', check: 'ruby/test_bignum.rb', mspecopt: "spec/ruby/core/integer" } } - { uses: './.github/actions/compilers', name: 'jemalloc', with: { append_configure: '--with-jemalloc' } } - { uses: './.github/actions/compilers', name: 'valgrind', with: { append_configure: '--with-valgrind' } } - { uses: './.github/actions/compilers', name: 'coroutine=ucontext', with: { append_configure: '--with-coroutine=ucontext' } }