From 1c9c90ffad39737cc1053d891314ecb8665fc82d Mon Sep 17 00:00:00 2001 From: Maksudul Haque Date: Sun, 8 Jan 2023 20:48:55 +0600 Subject: [PATCH 1/3] Handle Updates for GitHub Actions that are Located Inside Sub-Directories --- src/main.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.py b/src/main.py index 1fb24bc..b7459ee 100644 --- a/src/main.py +++ b/src/main.py @@ -148,6 +148,10 @@ def _update_workflow(self, workflow_path: str) -> set[str]: for action in all_actions: try: action_repository, current_version = action.split("@") + # A GitHub Action can be in a subdirectory of a repository + # e.g. `flatpak/flatpak-github-actions/flatpak-builder@v4`. + # we only need `user/repo` part from action_repository + action_repository = "/".join(action_repository.split("/")[:2]) except ValueError: gha_utils.warning( f'Action "{action}" is in a wrong format, ' From a11e70518a912615d9adbb25f861b8081779cc60 Mon Sep 17 00:00:00 2001 From: Maksudul Haque Date: Sun, 8 Jan 2023 20:59:48 +0600 Subject: [PATCH 2/3] Fix --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index b7459ee..2a83bff 100644 --- a/src/main.py +++ b/src/main.py @@ -147,11 +147,11 @@ def _update_workflow(self, workflow_path: str) -> set[str]: for action in all_actions: try: - action_repository, current_version = action.split("@") + action_location, current_version = action.split("@") # A GitHub Action can be in a subdirectory of a repository # e.g. `flatpak/flatpak-github-actions/flatpak-builder@v4`. # we only need `user/repo` part from action_repository - action_repository = "/".join(action_repository.split("/")[:2]) + action_repository = "/".join(action_location.split("/")[:2]) except ValueError: gha_utils.warning( f'Action "{action}" is in a wrong format, ' @@ -170,7 +170,7 @@ def _update_workflow(self, workflow_path: str) -> set[str]: ) continue - updated_action = f"{action_repository}@{new_version}" + updated_action = f"{action_location}@{new_version}" if action != updated_action: gha_utils.echo(f'Found new version for "{action_repository}"') From f6e7f3278f6a5d97028f7d29817c4d42e69c55fa Mon Sep 17 00:00:00 2001 From: Maksudul Haque Date: Sun, 8 Jan 2023 21:17:29 +0600 Subject: [PATCH 3/3] Cleanup --- src/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.py b/src/main.py index 2a83bff..02d26a5 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,5 @@ import os import pprint -import time from collections.abc import Generator from functools import cache, cached_property from typing import Any