Skip to content

Commit

Permalink
Merge branch 'master' into hbmk2_lefteq
Browse files Browse the repository at this point in the history
  • Loading branch information
tuffnatty authored Nov 16, 2023
2 parents 242aa01 + 0000838 commit 3f48a5f
Show file tree
Hide file tree
Showing 2,243 changed files with 156,081 additions and 113,995 deletions.
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ChangeLog.txt ident
*.cpp text
*.css text
*.def text
*.dif text
*.diff text
*.h text
*.hb text
*.hbc text
Expand All @@ -30,6 +30,7 @@ ChangeLog.txt ident
*.mft text
*.mk text
*.nsi text
*.patch text
*.pem text
*.po text
*.prg text
Expand All @@ -38,7 +39,6 @@ ChangeLog.txt ident
*.sfc text
*.spec text
*.sx text
*.tpl text
*.txt text
*.ucf text
*.vbs text
Expand Down Expand Up @@ -73,7 +73,7 @@ ChangeLog.txt ident
*.pdf binary
*.pfb binary
*.png binary
*.sq3 binary
*.sqlite3 binary
*.tif binary

# TOTEST:
Expand Down
118 changes: 118 additions & 0 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
name: linux-ci

on:
- push
- pull_request

jobs:
ubuntu-ci:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
compiler:
- clang
- gcc
strictness:
- "normal"
- "strict"

steps:

- name: Configure environment
shell: bash
run: |
echo "Nothing to do for Linux"
- name: Install packages
run: |
sudo apt-get install -qq \
valgrind \
libncurses-dev \
libslang2-dev \
libx11-dev \
libgpm-dev \
liballegro4.2-dev \
libcairo2-dev \
libcups2-dev \
libcurl4-openssl-dev \
firebird-dev \
libgd-dev \
libgs-dev \
libmagic-dev \
libmysqlclient-dev \
unixodbc-dev \
libpq-dev \
qtbase5-dev
# Dependencies for disabled contribs:
# libfreeimage-dev \
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.event.client_payload.branch }}

- run: pwd
- run: ls

- name: Prepare ccache using action
uses: hendrikmuhs/ccache-action@v1.2.10
with:
key: linux-${{ matrix.compiler }}-${{ matrix.strictness }}-ci
max-size: "32M"

- name: Configure build shell
run: |
set -ex
HB_USER_CFLAGS=""
HB_USER_LDFLAGS=""
case ${{matrix.strictness}} in
normal) ;;
strict) case ${{matrix.compiler}} in
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
esac ;;
esac
tee ./.bashrc <<EOENV
# These contribs do not build on any platform
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
export HB_BUILD_VERBOSE="yes"
export HBMK_WITH_SQLITE3="local"
export HB_USER_CFLAGS="$HB_USER_CFLAGS"
export HB_USER_LDFLAGS="$HB_USER_LDFLAGS"
export HB_CCACHE=ccache
EOENV
- name: Build Harbour
run: |
echo ::group::Build Harbour
set -ex
. ./.bashrc
make -j$(nproc) \
HB_BUILD_CONTRIBS=no \
HB_COMPILER=${{matrix.compiler}}
- name: Build contribs
run: |
echo ::group::Build contribs
set -ex
. ./.bashrc
make -j$(nproc) \
-C contrib \
HB_COMPILER=${{matrix.compiler}}
- name: Run tests
run: |
echo ::group::Run tests
set -ex
VALGRIND="valgrind --error-exitcode=1"
$VALGRIND bin/linux/${{matrix.compiler}}/hbtest
cd contrib/hbsqlit3/tests
../../../bin/linux/${{matrix.compiler}}/hbmk2 backup.prg
$VALGRIND ./backup
105 changes: 105 additions & 0 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: macos-ci

on:
- push
- pull_request

jobs:
macos-ci:
runs-on: macos-latest

strategy:
fail-fast: false
matrix:
compiler:
- clang
- gcc
strictness:
- "normal"
- "strict"

steps:

- name: Configure environment
run: |
echo "Nothing to do for Macos"
- name: Install packages
run: |
brew install \
$(case ${{matrix.compiler }} in
(gcc) echo ${{matrix.compiler}} ;; esac) \
slang \
cairo \
libgd \
mysql \
postgresql \
qt5
# Dependencies for disabled contribs:
# freeimage \
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.event.client_payload.branch }}

- run: pwd
- run: ls

- name: Prepare ccache using action
uses: hendrikmuhs/ccache-action@v1.2.10
with:
key: macos-${{ matrix.cpu }}-${{ matrix.compiler }}-${{ matrix.strictness }}-ci
max-size: "32M"

- name: Configure build shell
run: |
set -ex
HB_USER_CFLAGS="-arch arm64 -arch x86_64"
HB_USER_LDFLAGS="-arch arm64 -arch x86_64"
case ${{matrix.strictness}} in
normal) ;;
strict) case ${{matrix.compiler}} in
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
esac ;;
esac
tee ./.bashrc <<EOENV
# These contribs do not build on any platform
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
export HB_BUILD_VERBOSE="yes"
export HBMK_WITH_SQLITE3="local"
export HB_USER_CFLAGS="$HB_USER_CFLAGS"
export HB_USER_LDFLAGS="$HB_USER_LDFLAGS"
export HB_CCACHE=ccache
case ${{matrix.compiler}} in
gcc) latest_gcc="\$(cd /usr/local/bin && ls gcc-[1-9]* | sort -n | tail -1)"
export HB_CCSUFFIX="\${latest_gcc#gcc}" ;;
esac
EOENV
- name: Build Harbour
run: |
echo ::group::Build Harbour
set -ex
. ./.bashrc
make -j$(sysctl -n hw.ncpu) \
HB_BUILD_CONTRIBS=no \
HB_COMPILER=${{matrix.compiler}}
- name: Build contribs
run: |
echo ::group::Build contribs
set -ex
. ./.bashrc
make -j$(sysctl -n hw.ncpu) \
-C contrib \
HB_COMPILER=${{matrix.compiler}}
- name: Run tests
run: |
echo ::group::Run tests
set -ex
bin/darwin/${{matrix.compiler}}/hbtest
Loading

0 comments on commit 3f48a5f

Please sign in to comment.