Skip to content

Commit

Permalink
Update settings for an AppImage packages
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-w committed Sep 16, 2024
1 parent 3df3f38 commit 21f9879
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
# AppImage x86_64/Qt5
appimage-amd64-qt5:
name: "x86_64 (qt5)"
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
if: "contains(github.event.head_commit.message, '[publish]') || contains(github.ref, 'heads/stellarium-next') || contains(github.ref, 'heads/stellarium-stable')"

steps:
Expand All @@ -25,12 +25,12 @@ jobs:
sudo apt remove php7.* -y
sudo apt remove php8.* -y
sudo apt update
sudo apt install libfuse2 libglx-dev
#sudo apt install libfuse2 libglx-dev
# using force-overwrite due to
# https://github.com/actions/virtual-environments/issues/2703
#sudo ACCEPT_EULA=Y apt upgrade -o Dpkg::Options::="--force-overwrite" --yes
# Installing dependencies
sudo apt install -y qtbase5-private-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libgps-dev libqt5positioning5 libqt5positioning5-plugins qtwebengine5-dev libqt5charts5-dev zlib1g-dev libgl1-mesa-dev libdrm-dev cmake
sudo apt install -y libtbb-dev qtbase5-private-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libgps-dev libqt5positioning5 libqt5positioning5-plugins qtwebengine5-dev libqt5charts5-dev zlib1g-dev libgl1-mesa-dev libdrm-dev cmake
#sudo pip3 install appimage-builder
sudo wget https://github.com/AppImageCrafters/appimage-builder/releases/download/Continuous/appimage-builder-1.1.1.dev32+g2709a3b-x86_64.AppImage -O /usr/local/bin/appimage-builder
sudo chmod +x /usr/local/bin/appimage-builder
Expand Down
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ sudo apt install build-essential cmake zlib1g-dev libgl1-mesa-dev libdrm-dev gcc
qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins \
libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libqt5positioning5 \
libqt5positioning5-plugins qtwebengine5-dev libqt5charts5-dev \
libexiv2-dev libnlopt-cxx-dev
libexiv2-dev libnlopt-cxx-dev libtbb-dev libtbb2
```

##### Qt6
Expand Down
12 changes: 7 additions & 5 deletions util/appimage/stellarium-appimage-qt5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ AppDir:
apt:
arch: amd64
sources:
- sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
- sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse'
- sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse'
- sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse'
- sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse'

include:
- libqt5core5a
- libqt5gui5
- libqt5concurrent5
# - libqt5multimedia5
# - libqt5multimediawidgets5
# - libqt5multimedia5-plugins
Expand All @@ -42,10 +43,11 @@ AppDir:
# - libqt5webengine-data
- libqt5charts5
- libqt5opengl5
- libgps28
- libgps26
- libexiv2-27
- libnlopt-cxx0
- libnlopt0
- libtbb2
exclude: []

files:
Expand Down
1 change: 1 addition & 0 deletions util/appimage/stellarium-appimage-qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ AppDir:
- libqt6positioning6
- libqt6positioning6-plugins
- libqt6printsupport6
- libqt6concurrent6
# - libqt6webchannel6
- libqt6serialport6
- libqt6widgets6
Expand Down

0 comments on commit 21f9879

Please sign in to comment.