Skip to content

Commit 9669098

Browse files
PetewgPetewg
authored
Merge branch 'harbour:master' into master
2 parents 927e53f + 1a4c4e6 commit 9669098

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3559
-1611
lines changed

Diff for: ‎.github/workflows/linux-ci.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
libcups2-dev \
4141
libcurl4-openssl-dev \
4242
firebird-dev \
43+
libfreeimage-dev \
4344
libgd-dev \
4445
libgs-dev \
4546
libmagic-dev \
@@ -48,9 +49,6 @@ jobs:
4849
libpq-dev \
4950
qtbase5-dev
5051
51-
# Dependencies for disabled contribs:
52-
# libfreeimage-dev \
53-
5452
5553
- name: Checkout code
5654
uses: actions/checkout@v3
@@ -74,14 +72,13 @@ jobs:
7472
case ${{matrix.strictness}} in
7573
normal) ;;
7674
strict) case ${{matrix.compiler}} in
77-
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
78-
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
75+
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
76+
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
7977
esac ;;
8078
esac
8179
tee ./.bashrc <<EOENV
82-
# These contribs do not build on any platform
83-
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
8480
81+
export HB_BUILD_TEST="${{matrix.strictness}}"
8582
export HB_BUILD_VERBOSE="yes"
8683
export HBMK_WITH_SQLITE3="local"
8784
export HB_USER_CFLAGS="$HB_USER_CFLAGS"

Diff for: ‎.github/workflows/macos-ci.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ jobs:
3131
(gcc) echo ${{matrix.compiler}} ;; esac) \
3232
slang \
3333
cairo \
34+
freeimage \
3435
libgd \
3536
mysql \
3637
postgresql \
3738
qt5
3839
39-
# Dependencies for disabled contribs:
40-
# freeimage \
41-
4240
- name: Checkout code
4341
uses: actions/checkout@v3
4442
with:
@@ -61,14 +59,13 @@ jobs:
6159
case ${{matrix.strictness}} in
6260
normal) ;;
6361
strict) case ${{matrix.compiler}} in
64-
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
65-
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
62+
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
63+
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
6664
esac ;;
6765
esac
6866
tee ./.bashrc <<EOENV
69-
# These contribs do not build on any platform
70-
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
7167
68+
export HB_BUILD_TEST="${{matrix.strictness}}"
7269
export HB_BUILD_VERBOSE="yes"
7370
export HBMK_WITH_SQLITE3="local"
7471
export HB_USER_CFLAGS="$HB_USER_CFLAGS"

Diff for: ‎.github/workflows/vm1-ci.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ on:
66

77
jobs:
88
vm1-ci:
9-
runs-on: macos-latest
9+
runs-on: ubuntu-latest
1010

1111
strategy:
1212
fail-fast: false
1313
matrix:
1414
os:
1515
- name: freebsd
16-
version: "13.2"
16+
version: "14.2"
1717
- name: netbsd
18-
version: "9.3"
18+
version: "10.0"
1919
- name: openbsd
20-
version: "7.4"
20+
version: "7.6"
2121
compiler:
2222
- clang
2323
- gcc
@@ -30,7 +30,7 @@ jobs:
3030
- os: {name: openbsd}
3131
compiler: gcc
3232
# cross-platform-actions/[email protected] works for FreeBSD but hangs often
33-
- os: {name: freebsd}
33+
#- os: {name: freebsd}
3434

3535
steps:
3636

@@ -50,15 +50,13 @@ jobs:
5050
(gcc) echo ${{matrix.compiler}} ;; esac) \
5151
libslang2 \
5252
cairo \
53+
freeimage \
5354
libgd \
5455
mariadb-connector-c \
5556
postgresql16-client \
5657
qt5-buildtools qt5-gui
5758
EOF
5859
59-
# Dependencies for disabled contribs:
60-
# freeimage \
61-
6260
tee ~/work/install_netbsd_deps.sh <<EOF
6361
#!/bin/sh
6462
set -ex
@@ -78,7 +76,7 @@ jobs:
7876
chmod a+x ~/work/install_*_deps.sh
7977
8078
- name: Checkout code
81-
uses: actions/checkout@v3
79+
uses: actions/checkout@v4
8280
with:
8381
ref: ${{ github.event.client_payload.branch }}
8482

@@ -95,20 +93,18 @@ jobs:
9593
run: |
9694
set -ex
9795
case ${{matrix.os.name }} in
98-
*bsd) _cpus="sysctl -n hw.ncpu" ;;
96+
*bsd) _cpus="/sbin/sysctl -n hw.ncpu" ;;
97+
*) _cpus="echo 3" ;;
9998
esac
10099
HB_USER_CFLAGS=""
101100
HB_USER_LDFLAGS=""
102101
case ${{matrix.strictness}} in
103102
normal) ;;
104-
strict) case ${{matrix.compiler}} in
105-
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
106-
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
107-
esac ;;
103+
strict) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
108104
esac
109105
tee ./.bashrc <<EOENV
110106
# These contribs do not build on any platform
111-
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
107+
export HB_BUILD_TEST="${{matrix.strictness}}"
112108
113109
export HB_BUILD_VERBOSE="yes"
114110
export HBMK_WITH_SQLITE3="local"
@@ -117,6 +113,7 @@ jobs:
117113
export HB_CCACHE=ccache
118114
119115
export N_CPUS="\$($_cpus)"
116+
[ -n "$N_CPUS" ] || export N_CPUS=3
120117
EOENV
121118
122119
- name: Generate build script
@@ -132,6 +129,7 @@ jobs:
132129
echo ::group::Build Harbour
133130
set -ex
134131
. ./.bashrc
132+
${{matrix.compiler}} --version
135133
gmake -j$N_CPUS \
136134
HB_BUILD_CONTRIBS=no \
137135
HB_COMPILER=${{matrix.compiler}}
@@ -150,7 +148,7 @@ jobs:
150148
151149
- name: Build Harbour and contribs
152150
timeout-minutes: 30
153-
uses: cross-platform-actions/action@v0.21.1
151+
uses: cross-platform-actions/action@v0.26.0
154152
with:
155153
operating_system: ${{ matrix.os.name }}
156154
architecture: x86_64

Diff for: ‎.github/workflows/vm2-ci.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
exclude:
2828
- os: {name: omnios}
2929
compiler: clang
30-
# vmactions/solaris-vm works but is very slow to install gcc. Disable it for now
31-
- os: {name: solaris}
3230
- os: {name: solaris}
3331
compiler: clang
3432

@@ -50,15 +48,13 @@ jobs:
5048
(gcc) echo ${{matrix.compiler}} ;; esac) \
5149
libslang2 \
5250
cairo \
51+
freeimage \
5352
libgd \
5453
mariadb-connector-c \
5554
postgresql16-client \
5655
qt5-buildtools qt5-gui
5756
EOF
5857
59-
# Dependencies for disabled contribs:
60-
# freeimage \
61-
6258
tee ~/work/install_omnios_deps.sh <<EOF
6359
#!/usr/xpg4/bin/sh
6460
set -ex
@@ -75,7 +71,6 @@ jobs:
7571
/opt/csw/bin/pkgutil -U
7672
/opt/csw/bin/pkgutil -y -i \
7773
ccache \
78-
gcc5core \
7974
gmake \
8075
libcurl_dev \
8176
libssl_dev
@@ -104,20 +99,20 @@ jobs:
10499
case ${{matrix.os.name }} in
105100
*bsd) _cpus="sysctl -n hw.ncpu" ;;
106101
omnios|solaris) _cpus="psrinfo -p" _add_path="/usr/sfw/bin" ;;
102+
*) _cpus="echo 3" ;;
107103
esac
108104
HB_USER_CFLAGS=""
109105
HB_USER_LDFLAGS=""
110106
case ${{matrix.strictness}} in
111107
normal) ;;
112108
strict) case ${{matrix.compiler}} in
113-
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
109+
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
114110
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
115111
esac ;;
116112
esac
117113
tee ./.bashrc <<EOENV
118-
# These contribs do not build on any platform
119-
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
120114
115+
export HB_BUILD_TEST="${{matrix.strictness}}"
121116
export HB_BUILD_VERBOSE="yes"
122117
export HBMK_WITH_SQLITE3="local"
123118
export HB_USER_CFLAGS="$HB_USER_CFLAGS"
@@ -188,6 +183,7 @@ jobs:
188183
if: matrix.os.name == 'solaris'
189184
uses: vmactions/solaris-vm@v1
190185
with:
186+
release: "11.4-gcc"
191187
usesh: true
192188
mem: 4096
193189
prepare: |

Diff for: ‎.github/workflows/windows-ci.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,14 @@ jobs:
6464
mingw-w64-${{ env.msys_cpu }}-openssl
6565
mingw-w64-${{ env.msys_cpu }}-qt5-base
6666
67-
# Dependencies for disabled contribs:
68-
# mingw-w64-${{ env.msys_cpu }}-freeimage
69-
7067
- name: 'Add packages available on 64-bit hosts only'
7168
if: matrix.cpu != 'x86'
7269
shell: msys2 {0}
7370
run: |
7471
pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-postgresql
7572
pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-libmariadbclient
7673
pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-firebird
74+
pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-freeimage
7775
7876
- name: Checkout code
7977
uses: actions/checkout@v3
@@ -113,15 +111,13 @@ jobs:
113111
case ${{matrix.strictness}} in
114112
normal) ;;
115113
strict) case ${{matrix.compiler}} in
116-
(mingw64) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
117114
(bcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -w!" ;;
118-
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
115+
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
119116
esac ;;
120117
esac
121118
tee -a ./.bashrc <<EOENV
122-
# These contribs do not build on any platform
123-
export HB_BUILD_CONTRIBS="no hbfimage" # incompatible with freeimage 3.18+
124119
120+
export HB_BUILD_TEST="${{matrix.strictness}}"
125121
export HB_BUILD_VERBOSE="yes"
126122
export HBMK_WITH_SQLITE3="local"
127123
export HB_USER_CFLAGS="$HB_USER_CFLAGS"

0 commit comments

Comments
 (0)