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

ci: upgrade ubuntu VMs from 20.04 to 22.04 #4857

Merged
merged 3 commits into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: clazy
- name: clang-tidy
- name: coverage
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: ${{ matrix.name }}
steps:
- name: Check out repository
Expand Down Expand Up @@ -137,6 +137,6 @@ jobs:
continue-on-error: true
uses: coverallsapp/github-action@master
with:
flag-name: ubuntu-20.04
flag-name: ubuntu-22.04
path-to-lcov: build/lcov.info
github-token: ${{ secrets.GITHUB_TOKEN }}
27 changes: 24 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,27 @@ jobs:
fail-fast: false
matrix:
include:
- name: Ubuntu 22.04 (gcc)
os: ubuntu-22.04
cmake_args: >-
-DWARNINGS_FATAL=ON
-DBULK=ON
-DFFMPEG=ON
-DLOCALECOMPARE=ON
-DMAD=ON
-DMODPLUG=ON
-DWAVPACK=ON
-DINSTALL_USER_UDEV_RULES=OFF
ctest_args: []
compiler_cache: ccache
compiler_cache_path: ~/.ccache
cpack_generator: DEB
buildenv_basepath: /home/runner/buildenv
buildenv_script: tools/debian_buildenv.sh
artifacts_name: Ubuntu 22.04 DEB
artifacts_path: build/*.deb
artifacts_slug: ubuntu-jammy
qt_qpa_platform: offscreen
- name: Ubuntu 20.04 (gcc)
os: ubuntu-20.04
cmake_args: >-
Expand All @@ -34,7 +55,7 @@ jobs:
artifacts_slug: ubuntu-focal
qt_qpa_platform: offscreen
- name: Arch Linux (Qt 6.3, gcc)
os: ubuntu-20.04
os: ubuntu-22.04
# The Dockerfile for this container can be found at:
# https://github.com/Holzhaus/mixxx-ci-docker
container: holzhaus/mixxx-ci:20220612-qt6
Expand Down Expand Up @@ -150,7 +171,7 @@ jobs:

- name: "[macOS] Set up cmake"
uses: jwlawson/actions-setup-cmake@v1.12
# Ubuntu 20.04 should use the CMake version from the repos, and Visual
# Ubuntu 22.04 should use the CMake version from the repos, and Visual
# Studio on Windows comes with its own CMake version anyway.
if: runner.os == 'macOS'
with:
Expand Down Expand Up @@ -319,7 +340,7 @@ jobs:

- name: "Package for PPA"
# No need to do the PPA build for both Ubuntu versions
if: matrix.os == 'ubuntu-20.04' && matrix.container == null
if: matrix.os == 'ubuntu-22.04' && matrix.container == null
run: |
if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies -D CPACK_DEBIAN_DEBIAN_VERSION=0ubuntu2"
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.3.0
hooks:
- id: fix-byte-order-marker
exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters)$
Expand Down Expand Up @@ -63,7 +63,7 @@ repos:
#args: [--ignore-words, .codespellignore, --ignore-regex, "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))"]
exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.14.0
rev: v8.20.0
hooks:
- id: eslint
args: [--fix, --report-unused-disable-directives]
Expand All @@ -88,12 +88,12 @@ repos:
language: python
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.6.0
hooks:
- id: black
files: ^tools/.*$
- repo: https://gitlab.com/pycqa/flake8
rev: '3.9.2'
- repo: https://github.com/pycqa/flake8
rev: '4.0.1'
hooks:
- id: flake8
files: ^tools/.*$
Expand All @@ -106,8 +106,8 @@ repos:
rev: v0.4.0
hooks:
- id: markdownlint-cli2
- repo: https://github.com/sirosen/check-jsonschema
rev: 0.14.3
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.17.1
hooks:
- id: check-github-workflows
- repo: local
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/dlgprefcontrollers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
createLinkColor();
setupControllerWidgets();

connect(btnOpenUserMappings, &QPushButton::clicked, [=, this]() {
connect(btnOpenUserMappings, &QPushButton::clicked, this, [=, this]() {
QString mappingsPath = userMappingsPath(m_pConfig);
openLocalFile(mappingsPath);
});
Expand Down