Commit f80e8ba5 authored by Yaya's avatar Yaya
Browse files

gitlab: Repair --commit functionality in update.py 

Some packages have been moved to `pkgs/by-name` in the meantime. With
this commit it is possible again to automatically commit the changes
after updating with `update.py`.
parent f1d98a95

pkgs/applications/version-management/gitlab/update.py

+15 −11
Original line number Diff line number Diff line
@@ -375,15 +375,12 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: 
        [

            "git",

            "add",

            "data.json",

            "rubyEnv",

            "gitaly",

            "gitlab-pages",

            "gitlab-shell",

            "gitlab-workhorse",

            "gitlab-elasticsearch-indexer",

            "pkgs/applications/version-management/gitlab",

            "pkgs/by-name/gi/gitaly",

            "pkgs/by-name/gi/gitlab-elasticsearch-indexer",

            "pkgs/by-name/gi/gitlab-pages",

        ],

        cwd=GITLAB_DIR,

        cwd=NIXPKGS_PATH,

    )

    subprocess.run(

        [
@@ -392,13 +389,20 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: 
            "--message",

            f"""gitlab: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/gitlab/-/blob/{new_rev}/CHANGELOG.md""",

        ],

        cwd=GITLAB_DIR,

        cwd=NIXPKGS_PATH,

    )





def commit_container_registry(old_version: str, new_version: str) -> None:

    """Commits the gitlab-container-registry changes for you"""

    subprocess.run(["git", "add", "gitlab-container-registry"], cwd=GITLAB_DIR)

    subprocess.run(

        [

            "git",

            "add",

            "pkgs/by-name/gi/gitlab-container-registry"

        ],

        cwd=NIXPKGS_PATH,

    )

    subprocess.run(

        [

            "git",
@@ -406,7 +410,7 @@ def commit_container_registry(old_version: str, new_version: str) -> None: 
            "--message",

            f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md",

        ],

        cwd=GITLAB_DIR,

        cwd=NIXPKGS_PATH,

    )