diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-03 01:57:47 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-08 22:32:12 +0200 |
| commit | 10e15c0f96eca0d1c74d62a7e9ec249ee9e40bb8 (patch) | |
| tree | ba3a147d1b50cde81ee261713a489a7abf05521e | |
| parent | Fix a few more clazy warnings (diff) | |
| download | nheko-10e15c0f96eca0d1c74d62a7e9ec249ee9e40bb8.tar.xz | |
Disable ubuntu builds until a recent enough Qt version is available
| -rw-r--r-- | .ci/macos/Brewfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile index 0674eb61..717447fc 100644 --- a/.ci/macos/Brewfile +++ b/.ci/macos/Brewfile @@ -6,7 +6,7 @@ brew "clang-format" brew "cmake" brew "ninja" brew "openssl" -brew "qt5" +brew "qt6" brew "nlohmann_json" brew "gstreamer" brew "qtkeychain" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0a7c951..27e0807b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,8 @@ build-clazy: paths: - .ccache -build-gcc11: +# disabled until I find a qt6.5 ppa +.build-gcc11: stage: build image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/ubuntu:22.04 tags: [docker] @@ -232,7 +233,8 @@ build-flatpak: paths: ['build-flatpak/nheko-${ARCH}.flatpak'] name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-${ARCH} -appimage-amd64: +# disabled until I find a qt6.5 ppa for Ubuntu +.appimage-amd64: stage: build image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/ubuntu:22.04 tags: [docker] @@ -324,7 +326,7 @@ github-release: rules: - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/' dependencies: - - appimage-amd64 + #- appimage-amd64 <- disabled because of missing packages - build-flatpak - codesign-macos before_script: |