Skip to content

Commit

Permalink
CI: don't disable -Werror for Julia builds (#5827)
Browse files Browse the repository at this point in the history
* CI: don't disable -Werror for Julia builds

* Only define gap_jl_boundp when it is needed
  • Loading branch information
fingolfin committed Oct 28, 2024
1 parent e7ab658 commit c387f21
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
- os: ubuntu-20.04
shell: bash
test-suites: "testinstall"
extra: "JULIA=yes CONFIGFLAGS=\"--enable-debug --disable-Werror\""
extra: "JULIA=yes CONFIGFLAGS=\"--enable-debug\""

- os: windows-2019
# The 'run' steps in this job use Cygwin's bash, once it is set up.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gapjl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ jobs:
mv GAPROOT /tmp/GAPROOT
cd /tmp/GAPROOT
./autogen.sh
./configure
./configure --enable-Werror
make -j`nproc`
- name: "Override bundled GAP"
run: |
julia --proj=override $GAPJLPATH/etc/setup_override_dir.jl /tmp/GAPROOT /tmp/gap_jll_override
julia --proj=override $GAPJLPATH/etc/setup_override_dir.jl /tmp/GAPROOT /tmp/gap_jll_override --enable-Werror
- name: "Run tests"
run: |
julia --proj=override $GAPJLPATH/etc/run_with_override.jl /tmp/gap_jll_override --depwarn=error -e "using Pkg; Pkg.test(\"GAP\")"
2 changes: 2 additions & 0 deletions src/julia_gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,7 @@ jl_datatype_t * GAP_DeclareBag(jl_sym_t * name,
1, large > 0);
}

#ifdef HAVE_JL_REINIT_FOREIGN_TYPE
// internal wrapper for jl_boundp to deal with API change in Julia 1.12
static int gap_jl_boundp(jl_module_t *m, jl_sym_t *var)
{
Expand All @@ -753,6 +754,7 @@ static int gap_jl_boundp(jl_module_t *m, jl_sym_t *var)
return jl_boundp(m, var);
#endif
}
#endif

// Initialize the integration with Julia's garbage collector; in particular,
// create Julia types for use in our allocations. The types will be stored
Expand Down

0 comments on commit c387f21

Please sign in to comment.