Skip to content

Commit

Permalink
Reorganised prepare scripts for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
oleg68 committed Dec 12, 2024
1 parent 12ea361 commit 95382ea
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
with:
submodules: true
- name: Install Test Dependencies
run: ${{github.workspace}}/build-scripts/for-linux/prepare-debian-for-tests.sh
run: ${{github.workspace}}/build-scripts/for-linux/prepare-debian-based.sh

- name: Build
working-directory: ${{github.workspace}}
Expand Down
23 changes: 23 additions & 0 deletions build-scripts/for-linux/prepare-cpptrace.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash

set -e

CPP_TRACE_VERSION="0.4.1"

# Install cpptrace from sources
if ! ls /usr/local/lib*/libcpptrace.a &> /dev/null
then
BUILD_DIR=`mktemp -d`
pushd $BUILD_DIR
wget https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v$CPP_TRACE_VERSION.tar.gz
tar -xf v$CPP_TRACE_VERSION.tar.gz
cd cpptrace-$CPP_TRACE_VERSION
mkdir -p build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release
make -j`nproc`
sudo make install
popd
else
echo "Cpptrace is already installed"
fi
7 changes: 6 additions & 1 deletion build-scripts/for-linux/prepare-debian-based.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
docbook-xsl \
dpkg-dev \
file \
gcovr \
gettext \
imagemagick \
pkg-config \
Expand All @@ -83,6 +84,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
libcurl4-openssl-dev:$TARGET_ARCH

# download and install additional packages

mkdir -p deb
pushd deb

Expand All @@ -105,4 +107,7 @@ fi
# installing on other systems. Remove the version
if dpkg -s libwxgtk3.2-dev 2>/dev/null && ! grep -q libwx /etc/dpkg/shlibs.override; then
cut -d " " -f 1-3 /var/lib/dpkg/info/libwx*3.2*.shlibs | sudo sh -c "cat >>/etc/dpkg/shlibs.override"
fi
fi

# install cpptrace
$DIR/prepare-cpptrace.bash
29 changes: 0 additions & 29 deletions build-scripts/for-linux/prepare-debian-for-tests.sh

This file was deleted.

6 changes: 5 additions & 1 deletion build-scripts/for-linux/prepare-fedora.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
WX_PKG_NAME=wxGTK-devel
[[ "$1" == "wx30" ]] && WX_PKG_NAME=wxGTK3-devel

DIR=`dirname $0`

set -e
sudo dnf install -y \
cmake gcc-c++ make gettext docbook-style-xsl zip po4a ImageMagick rpm-build \
cmake gcc-c++ make gettext docbook-style-xsl gcovr zip po4a ImageMagick rpm-build \
pipewire-jack-audio-connection-kit-devel fftw-devel zlib-devel wavpack-devel \
$WX_PKG_NAME alsa-lib-devel systemd-devel yaml-cpp-static dpkg-dev libcurl-devel

$DIR/prepare-cpptrace.bash

0 comments on commit 95382ea

Please sign in to comment.