revert name changes

DanEngelbrecht · Mar 3, 2024 · 630d943 · 630d943
1 parent e85c6ae
commit 630d943
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 30 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: linux-x64-${{matrix.target}}-${{matrix.config}}
+        name: linux_x64-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.o
@@ -38,8 +38,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: linux-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |
@@ -66,7 +64,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}}
+        name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.o
@@ -83,15 +81,13 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: darwin-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |
         ./dist.sh ${{matrix.arch}}
     - uses: actions/upload-artifact@v4
       with:
-        name: dist-darwin-${{matrix.arch}}
+        name: dist-darwin_${{matrix.arch}}
         path: dist
 
   build-win32:
@@ -111,7 +107,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: win32-x64-${{matrix.target}}-${{matrix.config}}
+        name: win32_x64-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.obj
@@ -126,8 +122,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: win32-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |

diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
@@ -22,7 +22,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: linux-x64-${{matrix.target}}-${{matrix.config}}
+        name: linux_x64-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.o
@@ -53,8 +53,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: linux-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |
@@ -81,7 +79,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}}
+        name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.o
@@ -117,15 +115,13 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: darwin-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |
         ./dist.sh ${{matrix.arch}}
     - uses: actions/upload-artifact@v4
       with:
-        name: dist-darwin-${{matrix.arch}}
+        name: dist-darwin_${{matrix.arch}}
         path: dist
 
   build-win32:
@@ -145,7 +141,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: win32-x64-${{matrix.target}}-${{matrix.config}}
+        name: win32_x64-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.obj
@@ -177,8 +173,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: win32-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -31,7 +31,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: linux-x64-${{matrix.target}}-${{matrix.config}}
+        name: linux_x64-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.o
@@ -62,8 +62,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: linux-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |
@@ -91,7 +89,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}}
+        name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.o
@@ -127,15 +125,13 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: darwin-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |
         ./dist.sh ${{matrix.arch}}
     - uses: actions/upload-artifact@v4
       with:
-        name: dist-darwin-${{matrix.arch}}
+        name: dist-darwin_${{matrix.arch}}
         path: dist
 
   build-win32:
@@ -155,7 +151,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: upload ${{matrix.target}}
       with:
-        name: win32-x64-${{matrix.target}}-${{matrix.config}}
+        name: win32_x64-${{matrix.target}}-${{matrix.config}}
         path: |
           build/**
           !build/**/*.obj
@@ -187,8 +183,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        pattern: win32-*
-        merge-multiple: true
         path: build/artifacts
     - name: build dist
       run: |