From a8fbb94ec0e3dc465f5049c2049e7bd84e28a897 Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Mon, 22 Jul 2024 13:28:42 +0300 Subject: [PATCH] Disable workaround, don't call gdbus-codegen in glib tests too. Easier than a workaround --- .github/workflows/build.yml | 3 --- recipes/glib/all/test_package/conanfile.py | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fcef97..3798239 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,9 +204,6 @@ jobs: - name: conan test run: conan test ${{ matrix.package.test_conanfile }} ${{ matrix.package.package_reference }} --build missing --profile:host ${{ matrix.config.host_profile }} --profile:build ubuntu - env: - # __pycache__ issue workaround ( https://github.com/conan-io/conan/issues/16707 ) - PYTHONDONTWRITEBYTECODE: 1 - name: conan login if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' diff --git a/recipes/glib/all/test_package/conanfile.py b/recipes/glib/all/test_package/conanfile.py index 686967e..cfc71f4 100644 --- a/recipes/glib/all/test_package/conanfile.py +++ b/recipes/glib/all/test_package/conanfile.py @@ -24,5 +24,6 @@ def test(self): if can_run(self): bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") self.run(bin_path, env="conanrun") - if self.settings.os != "Windows": - self.run("gdbus-codegen -h", env="conanrun") + # https://github.com/conan-io/conan/issues/16707 + # if self.settings.os != "Windows": + # self.run("gdbus-codegen -h", env="conanrun")