Skip to content

Commit

Permalink
Changes to CI tests
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Oct 14, 2024
1 parent 176c368 commit 96bccf1
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 17 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Build from source.
name: build_macos
on: [push, pull_request]
permissions: read-all
jobs:
build_ubuntu:
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: macos-12
configure_options: ''
- os: macos-13
configure_options: ''
- os: macos-14
configure_options: ''
- os: macos-15
configure_options: ''
steps:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
brew update -q
brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true
brew link --force gettext
ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
- name: Building from source
env:
CC: ${{ matrix.compiler }}
run: |
tests/build.sh ${{ matrix.configure_options }}
- name: Run tests
run: |
tests/runtests.sh
29 changes: 15 additions & 14 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
#!/bin/sh
# Script to generate ./configure using the autotools
# Script to generate configure and Makefile using the autotools.
#
# Version: 20230405
# Version: 20241013

EXIT_SUCCESS=0;
EXIT_FAILURE=1;

BINDIR="/usr/bin";
BINDIR=`which aclocal`;
BINDIR=`dirname ${BINDIR}`;

if ! test -x "${BINDIR}/aclocal";
if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/usr/bin";
then
BINDIR="/usr/local/bin";
BINDIR="/usr/bin";
fi
if ! test -x "${BINDIR}/aclocal";
if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/usr/local/bin";
then
BINDIR="/usr/local/bin";
fi
if ! test -x "${BINDIR}/aclocal";
if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/opt/local/bin";
then
# Default location of MacPorts installed binaries.
BINDIR="/opt/local/bin";
fi
if ! test -x "${BINDIR}/aclocal";
if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/opt/homebrew/bin";
then
# Default location of Homebrew installed binaries.
BINDIR="/opt/homebrew/bin";
fi
if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/mingw32/bin";
then
# Default location of 32-bit MSYS2-MinGW installed binaries.
BINDIR="/mingw32/bin";
fi
if ! test -x "${BINDIR}/aclocal";
if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/mingw64/bin";
then
# Default location of 64-bit MSYS2-MinGW installed binaries.
BINDIR="/mingw64/bin";
Expand Down Expand Up @@ -91,35 +97,30 @@ else

exit ${EXIT_FAILURE};
fi

if ! test -x "${AUTOCONF}";
then
echo "Unable to find: autoconf";

exit ${EXIT_FAILURE};
fi

if ! test -x "${AUTOHEADER}";
then
echo "Unable to find: autoheader";

exit ${EXIT_FAILURE};
fi

if ! test -x "${AUTOMAKE}";
then
echo "Unable to find: automake";

exit ${EXIT_FAILURE};
fi

if ! test -x "${AUTOPOINT}";
then
echo "Unable to find: autopoint";

exit ${EXIT_FAILURE};
fi

if ! test -x "${LIBTOOLIZE}";
then
echo "Unable to find: libtoolize";
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.71])

AC_INIT(
[libcthreads],
[20240911],
[20241014],
[[email protected]])

AC_CONFIG_SRCDIR(
Expand Down
4 changes: 2 additions & 2 deletions m4/common.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl Checks for common headers and functions
dnl
dnl Version: 20240513
dnl Version: 20241013

dnl Function to test if a certain feature was disabled
AC_DEFUN([AX_COMMON_ARG_DISABLE],
Expand Down Expand Up @@ -113,7 +113,7 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT],
ac_cv_enable_verbose_output=yes])
])

dnl Function to detect whether static executables support should be enabled
dnl Function to detect whether wide character type support should be enabled
AC_DEFUN([AX_COMMON_CHECK_ENABLE_WIDE_CHARACTER_TYPE],
[AX_COMMON_ARG_ENABLE(
[wide-character-type],
Expand Down

0 comments on commit 96bccf1

Please sign in to comment.