From 65fae902fc57db49cf05da5cb7abe72f97210b9f Mon Sep 17 00:00:00 2001
From: eine <eine@users.noreply.github.com>
Date: Fri, 15 May 2020 05:05:37 +0200
Subject: [PATCH] fix paths with subdirs

---
 .github/workflows/push.yml | 29 --------------------
 .github/workflows/test.yml | 56 ++++++++++++++++++++++++++++++++++++++
 tip.py                     | 20 ++++++++------
 3 files changed, 67 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/push.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
deleted file mode 100644
index b0ebc6e..0000000
--- a/.github/workflows/push.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: 'tip'
-
-on:
-  push:
-    tags:
-      - '*'
-      - '!tip'
-    branches:
-      - '*'
-  pull_request:
-
-env:
-  CI: true
-
-jobs:
-
-  tip:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: |
-        echo "Build some tool and generate some artifacts" > artifact.txt
-    - uses: ./
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        files: |
-          artifact.txt
-          README.md
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..7cbfb8f
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,56 @@
+name: 'test'
+
+on:
+  push:
+    tags:
+      - '*'
+      - '!tip'
+    branches:
+      - '*'
+  pull_request:
+
+env:
+  CI: true
+
+jobs:
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - run: echo "Build some tool and generate some artifacts" > artifact.txt
+
+    - name: Single
+      uses: ./
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        files: artifact.txt
+
+    - name: List
+      uses: ./
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        files: |
+          artifact.txt
+          README.md
+
+    - run: |
+        mkdir artifacts
+        echo "Build some tool and generate some artifacts" > artifacts/artifact.txt
+
+    - name: Single in subdir
+      uses: ./
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        files: artifacts/artifact.txt
+
+    - run: |
+        echo "tip hello" > artifacts/hello.md
+        echo "tip world" > artifacts/world.md
+
+    - name: Directory wildcard
+      uses: ./
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        files: artifacts/*
diff --git a/tip.py b/tip.py
index 92c24ee..2f4ca79 100755
--- a/tip.py
+++ b/tip.py
@@ -2,9 +2,10 @@
 
 from os import environ, getenv
 from sys import argv, stdout
-from github import Github
 from subprocess import check_call
 from glob import glob
+from pathlib import Path
+from github import Github
 
 print("· Get list of artifacts to be uploaded")
 
@@ -70,18 +71,19 @@ artifacts = files
 for asset in gh_release.get_assets():
     print(">", asset)
     print(" ", asset.name)
-    for fname in artifacts:
-        if asset.name == fname:
+    for artifact in artifacts:
+        aname = str(Path(artifact).name)
+        if asset.name == aname:
             print(" removing '%s'..." % asset.name)
             asset.delete_asset()
-            print(" uploading '%s'..." % fname)
-            gh_release.upload_asset(fname)
-            artifacts.remove(fname)
+            print(" uploading '%s'..." % artifact)
+            gh_release.upload_asset(artifact, name=aname)
+            artifacts.remove(artifact)
             break
 
-for fname in artifacts:
-    print(" uploading '%s'..." % fname)
-    gh_release.upload_asset(fname)
+for artifact in artifacts:
+    print(" uploading '%s'..." % artifact)
+    gh_release.upload_asset(artifact)
 
 stdout.flush()
 print("· Update Release reference (force-push tag)")