From 8237adf9504adad31949ecf9ebfd5f0aaf221b5e Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 12 May 2023 10:30:42 +0200 Subject: [PATCH] Do not use a specific target `native_desktop`. `native_desktop` is not a real target_platform. It is workaround to specify "build only kiwix-desktop on native_dyn". It was useful, when we need to build kiwix-desktop on a different build env than the other project (because of packaging constraints). Now we can build kiwix-desktop and all other projects on the same build env, we can remove it and build kiwix-desktop with other `native_dyn`. --- .github/scripts/build_definition.py | 2 +- .github/workflows/ci.yml | 1 - .github/workflows/releaseNigthly.yml | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/scripts/build_definition.py b/.github/scripts/build_definition.py index 3c01d7f1..9ab92cd9 100644 --- a/.github/scripts/build_definition.py +++ b/.github/scripts/build_definition.py @@ -32,7 +32,7 @@ | | | flatpak | | | | | B | ------------------------------------------------------------------------------------------------------- | | | native_static | d | d | dB | dB | | - | | | native_dyn | d | d | dB | dB | | + | | | native_dyn | d | d | dB | dB | B | | | | native_mixed | B | B | | | | # libzim CI is building alpine_dyn but not us | | | android_arm | dB | dB | | | | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 084b5998..43b2edf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: - native_static - native_dyn - native_mixed - - native_desktop - wasm - armv6_static - armv6_dyn diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index db07360e..46398ff0 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -16,7 +16,6 @@ jobs: - native_static - native_dyn - native_mixed - - native_desktop - wasm - armv6_static - armv6_mixed @@ -39,8 +38,6 @@ jobs: image_variant: focal - target: native_mixed image_variant: bionic - - target: native_desktop - image_variant: focal - target: wasm image_variant: focal - target: armv6_static