Skip to content

Commit 4b131a1

Browse files
committed
Update CI Workflows for macOS and Ubuntu
** Generated by CodeLite. ** Signed-off-by: Eran Ifrah <eran@codelite.org>
1 parent e390b82 commit 4b131a1

2 files changed

Lines changed: 19 additions & 8 deletions

File tree

.github/workflows/macos.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,21 @@ jobs:
2323

2424
steps:
2525

26+
- name: Install wxDap's dependencies
27+
run: |
28+
brew install git || true
29+
brew install cmake || true
30+
brew install libssh || true
31+
brew install hunspell || true
32+
2633
# WxWidgets
2734
- name: Checkout
2835
uses: actions/checkout@v4
2936
with:
3037
repository: wxWidgets/wxWidgets
31-
path: wxWidgets
32-
ref: v3.2.4
38+
ref: v3.2.8
3339
submodules: recursive
40+
path: wxWidgets
3441

3542
- name: Build and install wxWidgets
3643
run: |
@@ -40,6 +47,7 @@ jobs:
4047
make -j$(sysctl -n hw.physicalcpu)
4148
sudo make install
4249
50+
4351
# wxdap
4452
- name: Checkout wxdap
4553
uses: actions/checkout@v4

.github/workflows/ubuntu.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,27 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
# WxWidgets
26-
- name: install dependencies for wxWidgets
27-
run: sudo apt-get install build-essential clang-format-12 cmake git libedit-dev libgtk-3-dev libhunspell-dev libsqlite3-dev libssh-dev pkg-config xterm
25+
# wxWidgets
26+
- name: Install dependencies for wxWidgets
27+
run: |
28+
sudo apt-get update
29+
sudo apt-get install build-essential cmake gettext git libedit-dev libgtk-3-dev libhunspell-dev libsqlite3-dev libssh-dev pkg-config xterm libmariadb-dev libpq-dev
2830
2931
- name: Checkout WxWidgets
3032
uses: actions/checkout@v4
3133
with:
3234
repository: wxWidgets/wxWidgets
33-
path: wxWidgets
34-
ref: v3.2.4
35+
ref: ${{matrix.wx-version}}
3536
submodules: recursive
37+
path: wxWidgets
3638

37-
- name: build and install wxWidgets
39+
- name: Build and install wxWidgets
3840
run: |
3941
mkdir -p wxWidgets/build-release
4042
cd wxWidgets/build-release
4143
../configure --disable-debug_flag --with-gtk=3 --enable-stl
4244
make -j$(nproc) && sudo make install
45+
echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib >> $GITHUB_ENV
4346
4447
# wxdap
4548
- name: Checkout wxdap

0 commit comments

Comments
 (0)