Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ubuntu 18.04 -> 20.04 #3155

Closed
wants to merge 2 commits into from
Closed

ubuntu 18.04 -> 20.04 #3155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87c88e2
ubuntu 18.04 -> 20.04
Surendrajat Mar 30, 2023
7d30fbe
Merge branch 'dev' into ubuntu20
wargio Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ jobs:
package: true
system-deps: false
python-version: 3.7.x
- name: linux-x86_64-system-deps # ensure that Cutter can be built at least in basic config on Ubuntu 18.04 using sytem libraries
os: ubuntu-18.04
python-version: 3.6.x
- name: linux-x86_64-system-deps # ensure that Cutter can be built at least in basic config on Ubuntu 20.04 using sytem libraries
os: ubuntu-20.04
python-version: 3.8.x
system-deps: true
cc-override: '/usr/bin/gcc-7'
cxx-override: '/usr/bin/g++-7'
cc-override: '/usr/bin/gcc-9'
cxx-override: '/usr/bin/g++-9'
- name: linux-x86_64-qt6-system-deps # ensure that Cutter can be built at least in basic config on Ubuntu 22.04 using sytem libraries
os: ubuntu-22.04
python-version: 3.10.x
system-deps: true
cc-override: '/usr/bin/gcc-12'
cxx-override: '/usr/bin/g++-12'
- name: linux-x86_64
os: ubuntu-18.04
python-version: 3.7.x
os: ubuntu-20.04
python-version: 3.8.x
system-deps: false
package: true
cc-override: default
Expand All @@ -61,7 +61,7 @@ jobs:
cc-override: default
cxx-override: default
- name: tarball
python-version: 3.7.x
python-version: 3.8.x
os: ubuntu-20.04
system-deps: false
tarball: true
Expand All @@ -77,12 +77,12 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install libgraphviz-dev mesa-common-dev libxkbcommon-x11-dev ninja-build
if [[ "${{ matrix.os }}" = "ubuntu-18.04" || "${{ matrix.os }}" = "ubuntu-20.04" ]]
if [[ "${{ matrix.os }}" = "ubuntu-20.04" ]]
then
# install additional packages needed for appimage
sudo apt-get install libxcb1-dev libxkbcommon-dev libxcb-*-dev libegl1 libclang-8-dev llvm-8
fi
if [[ "${{ matrix.os }}" = "ubuntu-18.04" && "${{ matrix.system-deps }}" = "true" ]]
if [[ "${{ matrix.os }}" = "ubuntu-20.04" && "${{ matrix.system-deps }}" = "true" ]]
then
sudo apt-get install qt5-default libqt5svg5-dev qttools5-dev qttools5-dev-tools
fi
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
-no-strip -exclude-libs=libnss3.so,libnssutil3.so,libqjp2.so \
-ignore-glob=usr/lib/python3.9/**/* \
-verbose=2
find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
# find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
export APPIMAGE_FILE="Cutter-${PACKAGE_ID}-Linux-x86_64.AppImage"
mv Cutter-*-x86_64.AppImage "$APPIMAGE_FILE"
echo PACKAGE_NAME=$APPIMAGE_FILE >> $GITHUB_ENV
Expand Down