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.

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

App image combined #2300

Merged
merged 2 commits into from Sep 23, 2019
Merged

App image combined #2300

merged 2 commits into from Sep 23, 2019

Conversation

dirkhh
Copy link
Collaborator

@dirkhh dirkhh commented Sep 22, 2019

Describe the pull request:

  • Bug fix
  • Functional change
  • New feature
  • Code cleanup
  • Build system change
  • Documentation change
  • Language translation

Pull request long description:

This is a combination of #2296 and #2298 by @buxtonpaul
I updated the reference to the 0.7 docker image based on his code. The only reason I'm pushing them as a combined PR is so that we can test the resulting AppImage and make sure nothing got broken compared to Paul's testing.

Mentions:

@buxtonpaul please take a look at the AppImage that is created as a result of the Travis run and make sure that it works for you

Paul Buxton added 2 commits September 22, 2019 14:18
Add ssl to the AppImage build.
Add helper script to fetch required dependancies.
Update docker build container used.

Signed-off-by: Paul Buxton <paubuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
When building dbus within the appimage, cmake picks up the installation
path of various files dbus uses through the GNUInstallDirs package,
however this doesn't work under the appimage build.
So we replace the variable with the normal location of this file.

Signed-off-by: Paul Buxton <paubuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
@buxtonpaul
Copy link
Contributor

Hmm, I don't seem to be able to find the build.
The latest one Continuous in https://github.com/Subsurface-divelog/subsurface/releases looks to be the build after, which I don't think includes this patch.

@dirkhh
Copy link
Collaborator Author

dirkhh commented Sep 23, 2019

Sorry - PR builds aren't populated back to the GitHub site. You need to look through the build log to find the transfer.sh address.
Please try this: https://transfer.sh/CF17k/Subsurface-4.9.3-71-g10d662aa52a8-x86_64.AppImage

@buxtonpaul
Copy link
Contributor

buxtonpaul commented Sep 23, 2019 via email

@dirkhh
Copy link
Collaborator Author

dirkhh commented Sep 23, 2019

Based on the positive feedback (and my own successful tests) I'll merge this.
THANKS @buxtonpaul for figuring out the two fixes!

@dirkhh dirkhh merged commit c1aa686 into master Sep 23, 2019
@dirkhh dirkhh deleted the AppImageCombined branch April 13, 2020 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants