Skip to content

Commit

Permalink
Test --enable-relative in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
dra27 committed Oct 4, 2024
1 parent cd0c05e commit 66c9bab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
CC=$CC
--enable-ocamltest
--enable-native-toplevel
--${{ matrix.cc == 'cl' && matrix.x86_64 && 'enable' || 'disable' }}-relative
run: >-
eval $(tools/msvs-promote-path) ;
if ! ./configure ${{ env.CONFIGURE_FLAGS }} ; then
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
'${{ github.event.repository.full_name }}'
- name: Configure tree
run: |
MAKE_ARG=-j CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
MAKE_ARG=-j CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel --enable-relative' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
- name: Build
run: |
MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
Expand Down Expand Up @@ -157,6 +157,7 @@ jobs:
os: macos-13
- name: macos-arm64
os: macos-14
config_arg: --enable-relative
- name: static
os: ubuntu-latest
config_arg: --disable-shared --disable-native-toplevel
Expand Down
4 changes: 2 additions & 2 deletions tools/ci/appveyor/appveyor_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ function set_configuration {
# Remove configure cache if the script has failed
if ! ./configure --cache-file="$CACHE_FILE" $dep $build $man $host \
--prefix="$2" --enable-ocamltest \
--enable-native-toplevel ; then
--enable-native-toplevel --enable-relative ; then
rm -f -- "$CACHE_FILE"
local failed
./configure --cache-file="$CACHE_FILE" $dep $build $man $host \
--prefix="$2" --enable-ocamltest \
--enable-native-toplevel \
--enable-native-toplevel --enable-relative \
|| failed=$?
if ((failed)) ; then cat config.log ; exit $failed ; fi
fi
Expand Down

0 comments on commit 66c9bab

Please sign in to comment.