Skip to content

Fix MacOS CI #222

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

Draft
ddeclerck wants to merge 5 commits into
base: gcos4gnucobol-3.x
Choose a base branch
from
Draft

Fix MacOS CI #222

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
5f288a7
Fix MacOS CI
ddeclerck Mar 26, 2025
8a1a3e0
Update bootstrap
GitMensch Mar 26, 2025
8c82ce9
Update bootstrap
GitMensch Mar 26, 2025
a19a383
Update macos.yml
GitMensch Mar 26, 2025
f8047c6
reset to use gettextize
GitMensch Mar 26, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: bootstrap
run: |
./build_aux/bootstrap install
./autogen.sh install

- name: Build environment setup
run: |
Expand All @@ -55,7 +55,7 @@ jobs:
../configure --enable-cobc-internal-checks \
--enable-hardening \
--with-curses=ncurses \
--prefix /opt/cobol/gnucobol-gcos \
--prefix /opt/cobol/gnucobol-gcos

- name: make
run: |
Expand Down
18 changes: 17 additions & 1 deletion build_aux/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Bootstrap gnucobol package from checked-out sources
# Note: call as ./bootstrap if you don't have readlink -f
#
# Copyright (C) 2017-2023 Free Software Foundation, Inc.
# Copyright (C) 2017-2023, 2025 Free Software Foundation, Inc.
# Written by Simon Sobisch
#
# This file is part of GnuCOBOL.
Expand Down Expand Up @@ -59,6 +59,22 @@ for file in $scripts ; do
fi
done

if test "$1" = "install"; then

echo; echo "running gettext to force updated gettext components..."
ret=0

# note: autopoint -f is already included as part of autoreconf -f
#(cd $MAINPATH; autopoint -f); ret=$?
#(cd $MAINPATH; rm -f m4/gettext.m4 m4/po.m4; autopoint -f); ret=$?
gettextize --no-changelog -f $MAINPATH; ret=$?

if test $ret -ne 0; then
echo; echo "ERROR, gettext returned $ret - aborting bootstrap" && exit $ret
fi

fi

echo; echo "running autoreconf..."
ret=0

Expand Down
Loading