Last Test, this should upload only packaged artifacts

sarah-walker-pcem · Nov 2, 2023 · 6ba1b02 · 6ba1b02
1 parent 76dfbc1
commit 6ba1b02
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -166,6 +166,6 @@ jobs:
           aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
           aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
           aws_bucket: pcem-dev-builds
-          source_dir: ./dist
-          destination_dir: ${{ matrix.artifacts_name }}
-          endpoint: https://cdn.ntgecdn.com:443
+          source_dir: ./dist/${{ matrix.artifacts_path }}
+          destination_dir: ''
+          endpoint:  https://cdn.ntgecdn.com:443    
diff --git a/.github/workflows/test-debug-builds.yml b/.github/workflows/test-debug-builds.yml
@@ -16,7 +16,7 @@ jobs:
                       os: ubuntu-latest
                       args: -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
                       artifacts_name: PCem-Debug-vNext-Ubuntu-${{ github.run_number }}
-                      artifacts_path: PCem-Debug-${{ github.sha }}.tar.bz2
+                      artifacts_path: PCem-Debug-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2
                       installdeps: >-
                           libsdl2-dev
                           libopenal-dev
@@ -29,7 +29,7 @@ jobs:
                       compiler: MINGW32
                       args: -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
                       artifacts_name: PCem-Debug-vNext-Windows-MINGW32-${{ github.run_number }}
-                      artifacts_path: PCem-Debug-${{ github.sha }}.zip
+                      artifacts_path: PCem-Debug-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip
                       installdeps: >-
                           base-devel
                           zip
@@ -47,7 +47,7 @@ jobs:
                       compiler: MINGW64
                       args: -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
                       artifacts_name: PCem-Debug-vNext-Windows-MINGW64-${{ github.run_number }}
-                      artifacts_path: PCem-Debug-${{ github.sha }}.zip
+                      artifacts_path: PCem-Debug-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip
                       installdeps: >-
                           base-devel
                           zip
@@ -163,6 +163,6 @@ jobs:
                   aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
                   aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
                   aws_bucket: pcem-dev-builds
-                  source_dir: ./dist
-                  destination_dir: ${{ matrix.artifacts_name }}
-                  endpoint: https://cdn.ntgecdn.com:443               
+                  source_dir: ./dist/${{ matrix.artifacts_path }}
+                  destination_dir: ''
+                  endpoint:  https://cdn.ntgecdn.com:443               
diff --git a/.github/workflows/test-release-builds.yml b/.github/workflows/test-release-builds.yml
@@ -16,7 +16,7 @@ jobs:
                       os: ubuntu-latest
                       args: -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
                       artifacts_name: PCem-vNext-Ubuntu-${{ github.run_number }}
-                      artifacts_path: PCem-${{ github.sha }}.tar.bz2
+                      artifacts_path: PCem-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2
                       installdeps: >-
                           libsdl2-dev
                           libopenal-dev
@@ -29,7 +29,7 @@ jobs:
                       compiler: MINGW32
                       args: -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
                       artifacts_name: PCem-vNext-Windows-MINGW32-${{ github.run_number }}
-                      artifacts_path: PCem-${{ github.sha }}.zip
+                      artifacts_path: PCem-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip
                       installdeps: >-
                           base-devel
                           zip
@@ -47,7 +47,7 @@ jobs:
                       compiler: MINGW64
                       args: -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
                       artifacts_name: PCem-vNext-Windows-MINGW64-${{ github.run_number }}
-                      artifacts_path: PCem-${{ github.sha }}.zip
+                      artifacts_path: PCem-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip
                       installdeps: >-
                           base-devel
                           zip
@@ -163,6 +163,6 @@ jobs:
                   aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
                   aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
                   aws_bucket: pcem-dev-builds
-                  source_dir: ./dist
-                  destination_dir: ${{ matrix.artifacts_name }}
+                  source_dir: ./dist/${{ matrix.artifacts_path }}
+                  destination_dir: ''
                   endpoint:  https://cdn.ntgecdn.com:443          
diff --git a/.github/workflows/test-relwithdebinfo-builds.yml b/.github/workflows/test-relwithdebinfo-builds.yml
@@ -15,8 +15,8 @@ jobs:
                     - name: Ubuntu 64bit (gcc)
                       os: ubuntu-latest
                       args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
-                      artifacts_name: PCem-vNext-Ubuntu-${{ github.run_number }}
-                      artifacts_path: PCem-${{ github.sha }}.tar.bz2
+                      artifacts_name: PCem-RelWithDebInfo-vNext-Ubuntu-${{ github.run_number }}
+                      artifacts_path: PCem-RelWithDebInfo-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2
                       installdeps: >-
                           libsdl2-dev
                           libopenal-dev
@@ -28,8 +28,8 @@ jobs:
                       os: windows-latest
                       compiler: MINGW32
                       args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
-                      artifacts_name: PCem-vNext-Windows-MINGW32-${{ github.run_number }}
-                      artifacts_path: PCem-${{ github.sha }}.zip
+                      artifacts_name: PCem-RelWithDebInfo-vNext-Windows-MINGW32-${{ github.run_number }}
+                      artifacts_path: PCem-RelWithDebInfo-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip
                       installdeps: >-
                           base-devel
                           zip
@@ -46,8 +46,8 @@ jobs:
                       os: windows-latest
                       compiler: MINGW64
                       args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
-                      artifacts_name: PCem-vNext-Windows-MINGW64-${{ github.run_number }}
-                      artifacts_path: PCem-${{ github.sha }}.zip
+                      artifacts_name: PCem-RelWithDebInfo-vNext-Windows-MINGW64-${{ github.run_number }}
+                      artifacts_path: PCem-RelWithDebInfo-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip
                       installdeps: >-
                           base-devel
                           zip
@@ -163,6 +163,6 @@ jobs:
                   aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
                   aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
                   aws_bucket: pcem-dev-builds
-                  source_dir: ./dist
-                  destination_dir: ${{ matrix.artifacts_name }}
-                  endpoint: https://cdn.ntgecdn.com:443            
+                  source_dir: ./dist/${{ matrix.artifacts_path }}
+                  destination_dir: ''
+                  endpoint:  https://cdn.ntgecdn.com:443