From ac3377c9c0c0ef843884a7cd54aa331ac2394be0 Mon Sep 17 00:00:00 2001
From: FormerLurker <hochgebe@gmail.com>
Date: Tue, 12 May 2020 14:41:57 -0500
Subject: Correct bad workflow action imports

---
 .github/workflows/ccpp.yml | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 1029791..a1ba2f4 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -230,13 +230,13 @@ jobs:
 
 
     - name: Upload tar
-      uses: actions/upload-artifact_tar@v1
+      uses: actions/upload-artifact@v1
       with:
         path: ./${{ matrix.config.artifact_tar }}
         name: ${{ matrix.config.artifact_tar }}
 
     - name: Upload zip
-      uses: actions/upload-artifact_zip@v1
+      uses: actions/upload-artifact@v1
       with:
         path: ./${{ matrix.config.artifact_zip }}
         name: ${{ matrix.config.artifact_zip }}
@@ -262,12 +262,7 @@ jobs:
       run: |
         echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url
 
-    - uses: actions/upload-artifact_tar@v1
-      with:
-        path: ./upload_url
-        name: upload_url
-
-    - uses: actions/upload-artifact_zip@v1
+    - uses: actions/upload-artifact@v1
       with:
         path: ./upload_url
         name: upload_url
@@ -308,36 +303,26 @@ jobs:
 
     steps:
     - name: Download artifact_tar
-      uses: actions/download-artifact_tar@v1
+      uses: actions/download-artifact@v1
       with:
         name: ${{ matrix.config.artifact_tar }}
         path: ./
 
     - name: Download artifact_zip
-      uses: actions/download-artifact_zip@v1
+      uses: actions/download-artifact@v1
       with:
         name: ${{ matrix.config.artifact_zip }}
         path: ./
 
-    - name: Download URL tar
-      uses: actions/download-artifact_tar@v1
+    - name: Download URL
+      uses: actions/download-artifact@v1
       with:
-        name: upload_url_tar
-        path: ./
-    - id: set_upload_url_tar
-      run: |
-        upload_url_tar=`cat ./upload_url_tar`
-        echo ::set-output name=upload_url_tar::$upload_url_tar
-
-    - name: Download URL zip
-      uses: actions/download-artifact_zip@v1
-      with:
-        name: upload_url_zip
+        name: upload_url
         path: ./
-    - id: set_upload_url_zip
+    - id: set_upload_url
       run: |
-        upload_url_zip=`cat ./upload_url_zip`
-        echo ::set-output name=upload_url_zip::$upload_url_zip
+        upload_url=`cat ./upload_url`
+        echo ::set-output name=upload_url::$upload_url
 
     - name: Upload tar to Release
       id: upload_tar_to_release
-- 
cgit v1.2.3