Last change should upload correctly

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

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -119,12 +119,15 @@ jobs:
         if: runner.os == 'Windows'
         shell: msys2 {0}
         run: |
-          export INSTALL_PREFIX=$(pwd)/dist
+          export INSTALL_PREFIX=$(pwd)/dist          
+          export ARTIFACTSDIR=$(pwd)/artifacts
+          mkdir -p $ARTIFACTSDIR
           cd temp/build
           ninja install
           cd $INSTALL_PREFIX
           ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
           zip -r -9 ${{ matrix.artifacts_path }} *
+          cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
       - name: prepare-package (Linux)
         if: runner.os == 'Linux'
@@ -148,16 +151,19 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           export DESTDIR=$(pwd)/dist
+          export ARTIFACTSDIR=$(pwd)/artifacts
+          mkdir -p $ARTIFACTSDIR
           cd temp/build
           ninja install
           cd $DESTDIR
           tar -cjf ${{ matrix.artifacts_path }} *
+          cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
       - name: "Upload GitHub Actions artifacts"
         uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.artifacts_name }}
-          path: ./dist/${{ matrix.artifacts_path }}
+          path: ./artifacts
 
       - name: Upload to NasuTek MinIO S3
         uses: shallwefootball/s3-upload-action@master
@@ -166,6 +172,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/${{ matrix.artifacts_path }}
+          source_dir: ./artifacts
           destination_dir: ''
           endpoint:  https://cdn.ntgecdn.com:443    
diff --git a/.github/workflows/test-debug-builds.yml b/.github/workflows/test-debug-builds.yml
@@ -117,11 +117,14 @@ jobs:
               shell: msys2 {0}
               run: |
                   export INSTALL_PREFIX=$(pwd)/dist
+                  export ARTIFACTSDIR=$(pwd)/artifacts
+                  mkdir -p $ARTIFACTSDIR
                   cd temp/build
                   ninja install
                   cd $INSTALL_PREFIX
                   ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
                   zip -r -9 ${{ matrix.artifacts_path }} *
+                  cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
             - name: prepare-package (Linux)
               if: runner.os == 'Linux'
@@ -145,16 +148,19 @@ jobs:
               if: runner.os == 'Linux'
               run: |
                   export DESTDIR=$(pwd)/dist
+                  export ARTIFACTSDIR=$(pwd)/artifacts
+                  mkdir -p $ARTIFACTSDIR
                   cd temp/build
                   ninja install
                   cd $DESTDIR
                   tar -cjf ${{ matrix.artifacts_path }} *
+                  cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
             - name: 'Upload GitHub Actions artifacts'
               uses: actions/upload-artifact@v2
               with:
                   name: ${{ matrix.artifacts_name }}
-                  path: ./dist/${{ matrix.artifacts_path }}
+                  path: ./artifacts
 
             - name: Upload to NasuTek MinIO S3
               uses: shallwefootball/s3-upload-action@master
@@ -163,6 +169,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/${{ matrix.artifacts_path }}
+                  source_dir: ./artifacts
                   destination_dir: ''
                   endpoint:  https://cdn.ntgecdn.com:443               
diff --git a/.github/workflows/test-release-builds.yml b/.github/workflows/test-release-builds.yml
@@ -117,11 +117,14 @@ jobs:
               shell: msys2 {0}
               run: |
                   export INSTALL_PREFIX=$(pwd)/dist
+                  export ARTIFACTSDIR=$(pwd)/artifacts
+                  mkdir -p $ARTIFACTSDIR
                   cd temp/build
                   ninja install
                   cd $INSTALL_PREFIX
                   ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
                   zip -r -9 ${{ matrix.artifacts_path }} *
+                  cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
             - name: prepare-package (Linux)
               if: runner.os == 'Linux'
@@ -145,16 +148,19 @@ jobs:
               if: runner.os == 'Linux'
               run: |
                   export DESTDIR=$(pwd)/dist
+                  export ARTIFACTSDIR=$(pwd)/artifacts
+                  mkdir -p $ARTIFACTSDIR
                   cd temp/build
                   ninja install
                   cd $DESTDIR
                   tar -cjf ${{ matrix.artifacts_path }} *
+                  cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
             - name: 'Upload GitHub Actions artifacts'
               uses: actions/upload-artifact@v2
               with:
                   name: ${{ matrix.artifacts_name }}
-                  path: ./dist/${{ matrix.artifacts_path }}
+                  path: ./artifacts
 
             - name: Upload to NasuTek MinIO S3
               uses: shallwefootball/s3-upload-action@master
@@ -163,6 +169,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/${{ matrix.artifacts_path }}
+                  source_dir: ./artifacts
                   destination_dir: ''
                   endpoint:  https://cdn.ntgecdn.com:443          
diff --git a/.github/workflows/test-relwithdebinfo-builds.yml b/.github/workflows/test-relwithdebinfo-builds.yml
@@ -117,11 +117,14 @@ jobs:
               shell: msys2 {0}
               run: |
                   export INSTALL_PREFIX=$(pwd)/dist
+                  export ARTIFACTSDIR=$(pwd)/artifacts
+                  mkdir -p $ARTIFACTSDIR
                   cd temp/build
                   ninja install
                   cd $INSTALL_PREFIX
                   ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
                   zip -r -9 ${{ matrix.artifacts_path }} *
+                  cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
             - name: prepare-package (Linux)
               if: runner.os == 'Linux'
@@ -145,16 +148,19 @@ jobs:
               if: runner.os == 'Linux'
               run: |
                   export DESTDIR=$(pwd)/dist
+                  export ARTIFACTSDIR=$(pwd)/artifacts
+                  mkdir -p $ARTIFACTSDIR
                   cd temp/build
                   ninja install
                   cd $DESTDIR
                   tar -cjf ${{ matrix.artifacts_path }} *
+                  cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
 
             - name: 'Upload GitHub Actions artifacts'
               uses: actions/upload-artifact@v2
               with:
                   name: ${{ matrix.artifacts_name }}
-                  path: ./dist/${{ matrix.artifacts_path }}
+                  path: ./artifacts
 
             - name: Upload to NasuTek MinIO S3
               uses: shallwefootball/s3-upload-action@master
@@ -163,6 +169,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/${{ matrix.artifacts_path }}
+                  source_dir: ./artifacts
                   destination_dir: ''
                   endpoint:  https://cdn.ntgecdn.com:443