From 0098dc19436c9d4ab27abf82090d0ad752acb30e Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:24:18 +0100 Subject: [PATCH 1/4] GitHub Actions: Debian build job: switch actions runner from ubuntu-18.04 to ubuntu-latest --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fa15bf9..093f35e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,14 +11,14 @@ jobs: matrix: include: - name: "Debian package test" - os: ubuntu-18.04 + os: ubuntu-latest CC: gcc CXX: g++ DEBIAN_BUILD: true - #- os: ubuntu-18.04 + #- os: ubuntu-latest #CC: gcc #CXX: g++ - #- os: ubuntu-18.04 + #- os: ubuntu-latest #CC: clang #CXX: clang++ #- os: macos-10.15 From 5dae9bf0902aa0cf12f55422216b6ad30a421b08 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:24:18 +0100 Subject: [PATCH 2/4] Azure Pipelines: Switch xbmc branch to Nexus --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4e639e5e..ee39796b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,7 +47,7 @@ jobs: - script: | cd .. - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi + git clone --branch Nexus --depth=1 https://github.com/xbmc/xbmc.git kodi cd $(Build.SourcesDirectory) mkdir build cd build From 355ee7979e7b2f851ee333911a03736274793ae4 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:24:27 +0100 Subject: [PATCH 3/4] README.md: Remove Coverity badge (we ran last analysis in 2020, so numbers are pointless) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 38706382..4810d5fd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Build and run tests](https://github.com/kodi-pvr/pvr.nextpvr/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/kodi-pvr/pvr.nextpvr/actions/workflows/build.yml) [![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.nextpvr?branchName=Nexus)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=64&branchName=Nexus) [![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.nextpvr/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.nextpvr/branches/) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # NextPVR PVR NextPVR PVR client addon for [Kodi](https://kodi.tv) From 7891aebbf971380948741f7253bba503d4a39d18 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:24:27 +0100 Subject: [PATCH 4/4] Remove .travis.yml --- .travis.yml | 58 ----------------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index edb5084c..00000000 --- a/.travis.yml +++ /dev/null @@ -1,58 +0,0 @@ -language: cpp - -# -# Define the build matrix -# -# Travis defaults to building on Ubuntu Trusty when building on -# Linux. We need Xenial in order to get up to date versions of -# cmake and g++. -# -env: - global: - - app_id=pvr.nextpvr - -matrix: - include: - - os: linux - dist: bionic - sudo: required - compiler: gcc - - os: linux - dist: bionic - sudo: required - compiler: clang - - os: linux - dist: bionic - sudo: required - compiler: gcc - env: DEBIAN_BUILD=true - - os: linux - dist: focal - sudo: required - compiler: gcc - env: DEBIAN_BUILD=true - - os: osx - osx_image: xcode10.2 - -before_install: - - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi - - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi - - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi - -# -# The addon source is automatically checked out in $TRAVIS_BUILD_DIR, -# we'll put the Kodi source on the same level -# -before_script: - - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi - - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi - - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi - - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi - - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi - - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi - - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi - - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi - -script: - - if [[ $DEBIAN_BUILD != true ]]; then make; fi - - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi