From d1d1a1f06aeb45fb0199ab1acfdd2ee9cd3abe49 Mon Sep 17 00:00:00 2001 From: Rechi Date: Mon, 25 Aug 2025 15:33:30 -0700 Subject: [PATCH 1/4] [ci] drop AppVeyor --- appveyor.yml | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 6228c98..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: BuildNr.{build} - -image: Visual Studio 2017 - -shallow_clone: true - -clone_folder: c:\projects\imagedecoder.heif - -environment: - app_id: imagedecoder.heif - - matrix: - - GENERATOR: "Visual Studio 15 2017" - ARCHITECTURE: Win32 - CONFIGURATION: Release - - GENERATOR: "Visual Studio 15 2017" - ARCHITECTURE: x64 - CONFIGURATION: Release - - GENERATOR: "Visual Studio 15 2017" - ARCHITECTURE: x64 - CONFIGURATION: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" - - GENERATOR: "Visual Studio 15 2017" - ARCHITECTURE: ARM64 - CONFIGURATION: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" - -build_script: - - cd .. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - - cd %app_id% - - mkdir build - - cd build - - mkdir -p definition\%app_id% - - echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt - - cmake -T host=x64 -G "%GENERATOR%" -A %ARCHITECTURE% %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons - - cmake --build . --config %CONFIGURATION% --target %app_id% From 392c2c0826919c2d72e78c9bea49d2ccdfaeaad9 Mon Sep 17 00:00:00 2001 From: Rechi Date: Mon, 25 Aug 2025 15:33:30 -0700 Subject: [PATCH 2/4] [ci] drop Travis CI --- .travis.yml | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b5d698c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -language: cpp - -# -# Define the build matrix -# -# Travis defaults to building on Ubuntu Precise when building on -# Linux. We need Trusty in order to get up to date versions of -# cmake and g++. -# -env: - global: - - app_id=imagedecoder.heif - -matrix: - include: - - os: linux - dist: xenial - sudo: required - compiler: gcc - - os: linux - dist: xenial - sudo: required - compiler: clang - - os: osx - osx_image: xcode10.2 - -# -# The addon source is automatically checked out in $TRAVIS_BUILD_DIR, -# we'll put the Kodi source on the same level -# -before_script: - - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - - cd ${app_id} && mkdir build && cd build - - mkdir -p definition/${app_id} - - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt - - 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 - -script: make From aa240ecb9b43a90fd361af438ac0283e601bccd2 Mon Sep 17 00:00:00 2001 From: Rechi Date: Mon, 25 Aug 2025 15:33:30 -0700 Subject: [PATCH 3/4] [ci] replace Debian package test with basic Linux build (gcc & clang) Debian package test is broken as Kodi Ubuntu PPA isn't maintained. --- .github/workflows/build.yml | 51 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45f4bc4..7593f06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,54 +1,53 @@ -name: Build and run tests +name: Build on: [push, pull_request] env: app_id: imagedecoder.heif jobs: build: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: fail-fast: false matrix: include: - - name: "Debian package test" - os: ubuntu-latest - CC: gcc - CXX: g++ - DEBIAN_BUILD: true + - name: "GCC build" + CC: gcc + CXX: g++ + - name: "Clang build" + CC: clang + CXX: clang++ steps: - - name: Install needed ubuntu depends - env: - DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} - run: | - 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 - name: Checkout Kodi repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: xbmc/xbmc - ref: master + ref: Omega path: xbmc - name: Checkout add-on repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: ${{ env.app_id }} + - name: Prepare + run: | + mkdir -p ${{ github.workspace }}/xbmc/cmake/addons/addons/${app_id} + echo ${app_id} ${{ github.workspace }}/${app_id} > ${{ github.workspace }}/xbmc/cmake/addons/addons/${app_id}/${app_id}.txt - name: Configure env: CC: ${{ matrix.CC }} CXX: ${{ matrix.CXX }} - DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} run: | - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/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 ${{ github.workspace }}/${app_id}; fi + cmake \ + -B ${app_id}/build \ + -DADDONS_TO_BUILD=${app_id} \ + -DADDON_SRC_PREFIX=${{ github.workspace }} \ + -DADDONS_DEFINITION_DIR=${{ github.workspace }}/xbmc/cmake/addons/addons \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons \ + -DPACKAGE_ZIP=1 \ + ${{ github.workspace }}/xbmc/cmake/addons - name: Build env: CC: ${{ matrix.CC }} CXX: ${{ matrix.CXX }} - DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} run: | - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi - if [[ $DEBIAN_BUILD != true ]]; then make; fi - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi + make -C ${app_id}/build -j$(getconf _NPROCESSORS_ONLN) From 21e80a95a40a94999ede0a3fd73a65bdcfc7a7bf Mon Sep 17 00:00:00 2001 From: Rechi Date: Mon, 25 Aug 2025 15:33:30 -0700 Subject: [PATCH 4/4] [ci] Azure: fix Windows SDK selection --- azure-pipelines.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 22c215c..7f7ce26 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,14 +41,9 @@ jobs: WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" ARM32-UWP: GENERATOR: "Visual Studio 17 2022" - ARCHITECTURE: ARM + ARCHITECTURE: ARM,version=10.0.17763.0 CONFIGURATION: Release WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" - #ARM64-UWP: - # GENERATOR: "Visual Studio 17 2022" - # ARCHITECTURE: ARM64 - # CONFIGURATION: Release - # WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" workspace: clean: all