Skip to content

Commit

Permalink
try build on ubuntu 22
Browse files Browse the repository at this point in the history
  • Loading branch information
supermerill committed May 23, 2024
1 parent ed3d32a commit 9ad213d
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_gtk3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: update apt
run: sudo apt update
- name: install gtk3 glew
run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext
run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext fuse
- name: build deps & slicer
run: ./BuildLinux.sh -ds
- name: make .pot
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_gtk3_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: update apt
run: sudo apt update
- name: install gtk3 glew
run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev libssl-dev libcurl4-openssl-dev gettext
run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev libssl-dev libcurl4-openssl-dev gettext fuse
- name: build deps & slicer
run: ./BuildLinux.sh -bds
- name: make .pot
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_gtk3_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: update apt
run: sudo apt update
- name: install gtk3 glew
run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext
run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext fuse
- name: build deps & slicer
run: ./BuildLinux.sh -ds
- name: make .pot
Expand Down
32 changes: 27 additions & 5 deletions BuildLinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export ROOT=`pwd`
export NCORES=`nproc --all`
FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
FOUND_GTK4=$(dpkg -l libgtk* | grep gtk-4)

unset name
while getopts ":dsiuhgb" opt; do
Expand All @@ -24,11 +25,17 @@ while getopts ":dsiuhgb" opt; do
BUILD_DEBUG="1"
;;
g )
FOUND_GTK3=""
FOUND_GTK4=""
;;
G )
FOUND_GTK2=""
FOUND_GTK3=""
;;
h ) echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
echo " -i: Generate appimage (optional)"
echo " -g: force gtk2 build"
echo " -G: force gtk4 build"
echo " -b: build in debug mode"
echo " -d: build deps (optional)"
echo " -s: build slic3r (optional)"
Expand All @@ -54,12 +61,18 @@ then
exit 0
fi

# mkdir build
if [ ! -d "build" ]
if [[ -n "$FOUND_GTK2" ]]
then
mkdir build
echo "Found GTK2"
fi
if [[ -n "$FOUND_GTK3" ]]
then
echo "Found GTK3"
fi
if [[ -n "$FOUND_GTK4" ]]
then
echo "Found GTK4"
fi


if [[ -n "$UPDATE_LIB" ]]
then
Expand Down Expand Up @@ -92,16 +105,25 @@ fi

FOUND_GTK2_DEV=$(dpkg -l libgtk* | grep gtk2.0-dev)
FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev)
echo "FOUND_GTK2=$FOUND_GTK2)"
FOUND_GTK4_DEV=$(dpkg -l libgtk* | grep gtk-4-dev)
if [[ -z "$FOUND_GTK2_DEV" ]]
then
if [[ -z "$FOUND_GTK3_DEV" ]]
then
if [[ -z "$FOUND_GTK4_DEV" ]]
then
echo "Error, you must install the dependencies before."
echo "Use option -u with sudo"
exit 0
fi
fi
fi

# mkdir build
if [ ! -d "build" ]
then
mkdir build
fi

echo "[1/9] Updating submodules..."
{
Expand Down

0 comments on commit 9ad213d

Please sign in to comment.