From 796f2d097d87db5dc0d245d8a679e1ff0ea3ec72 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 14 Mar 2020 10:21:10 +0100 Subject: [PATCH] CI: skip all dot folders for now (!1068) At the moment we assume that all files except in /.* belong to a package. Now that .shared-patches was moved to device/.shared-patches that does not work correctly anymore. This method should really check to which package the files belong (e.g. walk up directories until it finds an APKBUILD) instead of assuming they are directly in the same directory as the APKBUILD. For now just ignore **/.* (i.e. all files in dot folders), to unblock the MR since it's a critical fix. --- .gitlab-ci/check_changed_aports_versions.py | 1 + .gitlab-ci/common.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/check_changed_aports_versions.py b/.gitlab-ci/check_changed_aports_versions.py index cd3fe7c58..88112c180 100755 --- a/.gitlab-ci/check_changed_aports_versions.py +++ b/.gitlab-ci/check_changed_aports_versions.py @@ -124,6 +124,7 @@ if __name__ == "__main__": # Get and print modified packages common.add_upstream_git_remote() packages = common.get_changed_packages() + print(f"Changed packages: {packages}") # Verify modified package count common.get_changed_packages_sanity_check(len(packages)) diff --git a/.gitlab-ci/common.py b/.gitlab-ci/common.py index 7acb03acd..f7c846e26 100755 --- a/.gitlab-ci/common.py +++ b/.gitlab-ci/common.py @@ -116,7 +116,8 @@ def get_changed_packages(with_directory=False): # * in the root dir of pmaports (e.g. README.md) # * path beginning with a dot (e.g. .gitlab-ci/) # * non-existing files (deleted packages) - if "/" not in file or file.startswith(".") or not os.path.exists(file): + hidden = file.startswith(".") or "/." in file + if "/" not in file or hidden or not os.path.exists(file): continue # Add to the ret set (removes duplicated automatically)