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

Jump to bottom

build macOS environment on GitHub Actions, update dependencies, add ccache #94

Merged
merged 24 commits into from
Nov 21, 2020
Merged

build macOS environment on GitHub Actions, update dependencies, add ccache #94

merged 24 commits into from
Nov 21, 2020

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented Nov 16, 2020

No description provided.

Be-ing added 23 commits November 14, 2020 23:08
@Be-ing
update automake to 1.16.2
f5511ed
@Be-ing
update chromaprint to 1.5.0
7142c25
@Be-ing
update cmake to 3.18.4
26fafc6
@Be-ing
update flac to 1.3.3
e451438
@Be-ing
update libtool to 2.4.6
fe7e539
@Be-ing
update libusb to 1.0.23
350c11d
@Be-ing
update lv2 to 1.18.0
3c72d81
@Be-ing
update libogg to 1.3.3
2848fd7
@Be-ing
update openssl to 1.0.2u
83a27db
@Be-ing
update opus to 1.3.1 and opusfile to 0.12
8262d05
@Be-ing
update pkgconfig to 0.29.2
f0f7b4b
@Be-ing
update qtkeychain to 0.11.1
73651d8
@Be-ing
update rubberband to 1.9.0
c379ab6
@Be-ing
update to lilv 0.24.10, serd 0.30.4, sord 0.16.4, sratom 0.6.6
0acdeff
@Be-ing
update libshout to 2.4.4
3158db7
@Be-ing
update libsndfile to 1.0.30
681e49c
@Be-ing
update sqlite to 3330000
1f9e8b0
@Be-ing
update libvorbis to 1.3.7
e1a14b6
@Be-ing
downgrade to Qt 5.12.10
8759f59 
Qt 5.14 has major performance problems with the legacy QGLWidget on
macOS. Migrating to QOpenGLWidget will be done for Mixxx 2.4.
@Be-ing
use standard SDKROOT environment variable
5a88752
@Be-ing
add zstd 1.4.5
3a7a22b
@Be-ing
add ccache 4.0.0
ef84d98
@Be-ing
fix setting of minimum macOS version for cmake projects
063cc2d
@Be-ing
Copy link
Contributor Author

Be-ing commented Nov 17, 2020

ping

@Be-ing
Copy link
Contributor Author

Be-ing commented Nov 18, 2020

Ping. If no one has anything to say, I'll just go ahead and merge this soon.

Holzhaus
Holzhaus reviewed Nov 18, 2020
View reviewed changes
.github/workflows/build-environment-build.yml
# See also:
# - http://mywiki.wooledge.org/BashFAQ/105
# - https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
set -e -o pipefail
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm petrry sure that bash scripts are executes with pipefail anyway

.github/workflows/build-environment-build.yml
restore-keys: |
${{ env.cache-name }}-${{ runner.os }}-${{ github.head_ref }}
${{ env.cache-name }}-${{ runner.os }}
- name: build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- name: build
- name: Build

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

.github/workflows/build-environment-build.yml Outdated
Comment on lines 41 to 44
# Get the current installed macOS SDK.
MACOSX_SDK=10.15
# 10.12 is the minimum macOS version for Qt 5.12
MACOSX_TARGET=10.12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put this in an env block for this step? I think it's easier to read then.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

.github/workflows/build-environment-build.yml Outdated
# So we can tee into it right away.
mkdir -p environment/${ENVIRONMENT_NAME}

export DEPENDENCY_CACHE=/Users/runner/dependencies
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

env?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

scripts/macosx/build_qt5.sh Show resolved Hide resolved
scripts/macosx/build_shout.sh Show resolved Hide resolved
scripts/macosx/build_taglib.sh Show resolved Hide resolved
scripts/macosx/build_qt5.sh
@@ -39,7 +39,7 @@ export QTDIR=$MIXXX_PREFIX/Qt-${VERSION_NUMBER}
# Disable relocatable qt due to https://bugs.launchpad.net/mixxx/+bug/1871238
# TODO(rryan): Disable framework build or use frameworks properly. Qt assumes
# that if frameworks are enabled then they are used for deployment.
./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -no-feature-relocatable -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib
./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -ccache -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we put Qt in a separate subdirectory? That makes specifying the correct CMAKE_PREFIX_PATH much harder for Windows/macos devs. Can we change that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. I asked @rryan this on Zulip and did not get a response. AFAIK we could change it. But there is no pressing need to either.

@Be-ing Be-ing force-pushed the mac_github_actions branch 3 times, most recently from dccda99 to b7f5cef Compare November 18, 2020 23:31
@Be-ing Be-ing force-pushed the mac_github_actions branch from b7f5cef to dd844a1 Compare November 19, 2020 03:30
@Be-ing
Copy link
Contributor Author

Be-ing commented Nov 19, 2020

Ready for merge?

@Be-ing
Copy link
Contributor Author

Be-ing commented Nov 21, 2020

ping @Holzhaus

@Holzhaus Holzhaus merged commit e8b957e into mixxxdj:2.3.x-unix Nov 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Holzhaus Holzhaus Holzhaus left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Be-ing @Holzhaus