Fix package name handling (#31)

Chizkiyahu · Nov 2, 2023 · f2dddfa · f2dddfa
1 parent 36327a9
commit f2dddfa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,16 +28,16 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: lower case repository
-        id: lower_case_repository
+      - name: lower case repository_owner
+        id: lower_case_repository_owner
         uses: ASzc/change-string-case-action@v6
         with:
-          string: ${{ github.repository }}
+          string: ${{ github.repository_owner }}
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           file: ./CICD/Dockerfile_temp
-          tags: ghcr.io/${{ steps.lower_case_repository.outputs.lowercase }}/${{ matrix.type }}:${{ matrix.i }}
+          tags: ghcr.io/${{ steps.lower_case_repository_owner.outputs.lowercase }}/${{ matrix.type }}:${{ matrix.i }}
           build-args: |
             I=${{ matrix.i }}
           push: true
@@ -61,16 +61,16 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: lower case repository
-        id: lower_case_repository
+      - name: lower case repository_owner
+        id: lower_case_repository_owner
         uses: ASzc/change-string-case-action@v6
         with:
-          string: ${{ github.repository }}
+          string: ${{ github.repository_owner }}
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           file: ./CICD/Dockerfile_temp
-          tags: ghcr.io/${{ steps.lower_case_repository.outputs.lowercase }}/${{ matrix.type }}:${{ matrix.i }}
+          tags: ghcr.io/${{ steps.lower_case_repository_owner.outputs.lowercase }}/${{ matrix.type }}:${{ matrix.i }}
           build-args: |
             I=${{ matrix.i }}
           push: true
@@ -126,7 +126,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository_owner: ${{ github.repository_owner }}
           repository: ${{ github.repository }}
-          package_name: ${{ github.repository }}/p1
+          package_name: p1
           untagged_only: false
           owner_type: user
 

diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ delete all / untagged ghcr containers in a repository
       token: ${{ github.token }}
       repository_owner: ${{ github.repository_owner }}
       repository: ${{ github.repository }}
-      package_name: the-package-name # full name includes the repository name if is connected to repository
+      package_name: the-package-name
       untagged_only: true
       owner_type: org # or user
 ```
@@ -153,7 +153,7 @@ delete all / untagged ghcr containers in a repository
       token: ${{ github.token }}
       repository_owner: ${{ github.repository_owner }}
       repository: ${{ github.repository }}
-      package_name: the-package-name  # full name includes the repository name if is connected to repository
+      package_name: the-package-name
       untagged_only: true
       owner_type: org # or user
       except_untagged_multiplatform: true
@@ -167,7 +167,7 @@ delete all / untagged ghcr containers in a repository
       token: ${{ github.token }}
       repository_owner: ${{ github.repository_owner }}
       repository: ${{ github.repository }}
-      package_name: the-package-name  # full name includes the repository name if is connected to repository
+      package_name: the-package-name
       untagged_only: false
       owner_type: org # or user
 ```
diff --git a/clean_ghcr.py b/clean_ghcr.py
@@ -223,10 +223,6 @@ def get_args():
                 f"Mismatch in repository:{args.repository} and repository_owner:{args.repository_owner}"
             )
         args.repository = repository
-    if args.package_name and args.package_name.count("/") == 2:
-        _, repo_name, package_name = args.package_name.split("/")
-        package_name = f"{repo_name}/{package_name}"
-        args.package_name = package_name
     args.repository = args.repository.lower()
     args.repository_owner = args.repository_owner.lower()
     args.package_name = args.package_name.lower()