Fix issues with action yml

Signed-off-by: Andy Doan <andy@foundries.io>

Author: doanac

.github/workflows/unit-test.yml

@@ -21,3 +21,4 @@ jobs:
         with:
           path: ./build
           build_id: "${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt }}"
+          github_token: "${{ secrets.GITHUB_TOKEN }}"

action.yml

@@ -5,12 +5,15 @@ inputs:
     description: "Directory containing the files to upload"
     required: true
   build_id:
-    description: "Path on fileserver to put artifacts under: ${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt }}"
+    description: "Path on fileserver to put artifacts under: github.repository - github.run_id - github.run_attempt"
+    required: true
+  github_token:
+    description: "The secrets.GITHUB_TOKEN variable in the workflow"
     required: true
   fileserver_url:
     description: "Server to use for upload"
     required: true
-    default: "https://quic-yocto-fileserver-1029608027416.us-central1.run.app'"
+    default: "https://quic-yocto-fileserver-1029608027416.us-central1.run.app"
   upload_threads:
     description: "Number of concurrent upload threads to use"
     required: true
@@ -28,7 +31,10 @@ runs:
         BUILD_DIR: ${{ inputs.path }}
         BUILD_ID: ${{ inputs.build_id}}
         FILE_SERVER: ${{ inputs.fileserver_url }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ inputs.github_token }}
         UPLOAD_THREADS: ${{ inputs.upload_threads }}
       shell: bash
-      run: ./publish_artifacts.py
+      run: |
+        set -ex
+        python -m pip install requests
+        python ${GITHUB_ACTION_PATH}/publish_artifacts.py

publish_artifacts.py

@@ -80,7 +80,7 @@ def get_files_to_publish(path: str) -> List[str]:
 
 def main(num_threads: int, artifacts_dir: str, base_url: str, output_file: str):
     paths = get_files_to_publish(artifacts_dir)
-    print(f"= Found {len(paths)} files to publish", flush=True)
+    print(f"= Found {len(paths)} files to publish to {base_url}", flush=True)
 
     failed = False
     work = [(f"{base_url}{x}", artifacts_dir, x) for x in paths]
@@ -106,11 +106,11 @@ def main(num_threads: int, artifacts_dir: str, base_url: str, output_file: str):
         build_dir = build_dir + "/"
 
     file_server = os.environ["FILE_SERVER"]
-    if file_server[-1] != "/":
-        file_server = file_server + "/"
+    if file_server[-1] == "/":
+        file_server = file_server[:-1]
 
     build_id = os.environ["BUILD_ID"]
-    url = f"{file_server}/${build_id}/"
+    url = f"{file_server}/{build_id}/"
 
     num_threads_str = os.environ.get("UPLOAD_THREADS", "5")
     num_threads = int(num_threads_str)