From 66acef3f602bc45bbc28f05810ffd57346a47238 Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:05:36 -0500 Subject: [PATCH 1/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index b480cc868..a95b007ad 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -53,6 +53,7 @@ jobs: run: | cd "${{github.workspace}}/STAGING" foreach($file in $((dir "${{github.workspace}}/publish" -recurse | where {$_.extension -in ".exe",".dll"}).Fullname)){ mv $file ./ } + Get-ChildItem -Recurse - name: Create Pre-Release Archive if: ${{ steps.get_version.outputs.PRERELEASE == true }} @@ -61,15 +62,13 @@ jobs: - name: Create Release Archive if: ${{ steps.get_version.outputs.PRERELEASE != true }} run: Compress-Archive ./*.exe "VolumeControl-${{ steps.get_version.outputs.TAG }}-PreRelease.zip" - - - name: Stage Archive - run: mv "./*.zip" "${{github.workspace}}" - name: 'Upload Build Artifact' uses: actions/upload-artifact@v2 with: name: build-windows - path: "${{github.workspace}}/VolumeControl*.zip" + if-no-files-found: error + path: "${{github.workspace}}/STAGING/VolumeControl*.zip" - name: 'Create Release' uses: softprops/action-gh-release@v1 @@ -77,5 +76,6 @@ jobs: draft: true prerelease: ${{steps.get_version.outputs.PRERELEASE}} tag_name: ${{steps.get_version.outputs.VERSION}} + fail_on_unmatched_files: true files: | - ${{github.workspace}}/*.zip + ${{github.workspace}}/STAGING/*.zip From be43149d37d8c6dcd75ca70915304cc5d35df48d Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:09:18 -0500 Subject: [PATCH 2/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index a95b007ad..2a32de849 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -61,14 +61,16 @@ jobs: - name: Create Release Archive if: ${{ steps.get_version.outputs.PRERELEASE != true }} - run: Compress-Archive ./*.exe "VolumeControl-${{ steps.get_version.outputs.TAG }}-PreRelease.zip" + run: Compress-Archive '${{github.workspace}}/STAGING/*.exe' 'VolumeControl-${{ steps.get_version.outputs.TAG }}-PreRelease.zip' + + - run: cd ${{github.workspace}} - name: 'Upload Build Artifact' uses: actions/upload-artifact@v2 with: name: build-windows if-no-files-found: error - path: "${{github.workspace}}/STAGING/VolumeControl*.zip" + path: './STAGING/*.zip' - name: 'Create Release' uses: softprops/action-gh-release@v1 @@ -78,4 +80,4 @@ jobs: tag_name: ${{steps.get_version.outputs.VERSION}} fail_on_unmatched_files: true files: | - ${{github.workspace}}/STAGING/*.zip + './STAGING/*.zip' From 630cc0affcad7af31ccf7795bafe2775e49aefd1 Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:14:11 -0500 Subject: [PATCH 3/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index 2a32de849..6ba0d1173 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -57,20 +57,22 @@ jobs: - name: Create Pre-Release Archive if: ${{ steps.get_version.outputs.PRERELEASE == true }} - run: Compress-Archive ./*.exe "VolumeControl-${{ steps.get_version.outputs.TAG }}.zip" + run: Compress-Archive '${{github.workspace}}/STAGING/*' "VolumeControl-${{ steps.get_version.outputs.TAG }}.zip" - name: Create Release Archive if: ${{ steps.get_version.outputs.PRERELEASE != true }} - run: Compress-Archive '${{github.workspace}}/STAGING/*.exe' 'VolumeControl-${{ steps.get_version.outputs.TAG }}-PreRelease.zip' + run: Compress-Archive '${{github.workspace}}/STAGING/*' 'VolumeControl-${{ steps.get_version.outputs.TAG }}-PreRelease.zip' - - run: cd ${{github.workspace}} + - run: | + cd '${{github.workspace}}/STAGING' + Get-ChildItem -Recurse - name: 'Upload Build Artifact' uses: actions/upload-artifact@v2 with: name: build-windows if-no-files-found: error - path: './STAGING/*.zip' + path: './*.zip' - name: 'Create Release' uses: softprops/action-gh-release@v1 @@ -80,4 +82,4 @@ jobs: tag_name: ${{steps.get_version.outputs.VERSION}} fail_on_unmatched_files: true files: | - './STAGING/*.zip' + './*.zip' From fb382a3677ee58bfd9e8d7df1347c45601d347c0 Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:38:48 -0500 Subject: [PATCH 4/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 29 +++++++++----------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index 6ba0d1173..0894e5e82 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -55,25 +55,22 @@ jobs: foreach($file in $((dir "${{github.workspace}}/publish" -recurse | where {$_.extension -in ".exe",".dll"}).Fullname)){ mv $file ./ } Get-ChildItem -Recurse - - name: Create Pre-Release Archive - if: ${{ steps.get_version.outputs.PRERELEASE == true }} - run: Compress-Archive '${{github.workspace}}/STAGING/*' "VolumeControl-${{ steps.get_version.outputs.TAG }}.zip" - - - name: Create Release Archive - if: ${{ steps.get_version.outputs.PRERELEASE != true }} - run: Compress-Archive '${{github.workspace}}/STAGING/*' 'VolumeControl-${{ steps.get_version.outputs.TAG }}-PreRelease.zip' - - - run: | - cd '${{github.workspace}}/STAGING' - Get-ChildItem -Recurse - - - name: 'Upload Build Artifact' + - name: Upload Artifacts uses: actions/upload-artifact@v2 with: name: build-windows - if-no-files-found: error - path: './*.zip' + path: '${{github.workspace}}/STAGING/*' + + create-release: + runs-on: ubuntu-latest + + steps: + - name: Download Artifacts + uses: actions/download-artifact@v2 + with: + working-directory: ${{github.workspace}} + - name: 'Create Release' uses: softprops/action-gh-release@v1 with: @@ -82,4 +79,4 @@ jobs: tag_name: ${{steps.get_version.outputs.VERSION}} fail_on_unmatched_files: true files: | - './*.zip' + '${{github.workspace}}/*.exe' From ddc08fdb11b85a26af7573d5656a5fc9ea303563 Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:39:09 -0500 Subject: [PATCH 5/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index 0894e5e82..641c0bd2c 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -63,6 +63,7 @@ jobs: create-release: + needs: build-release runs-on: ubuntu-latest steps: From 6000e3b8813e674f052775993a41639240f115d8 Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:42:12 -0500 Subject: [PATCH 6/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index 641c0bd2c..135e94593 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -70,7 +70,7 @@ jobs: - name: Download Artifacts uses: actions/download-artifact@v2 with: - working-directory: ${{github.workspace}} + path: ${{github.workspace}} - name: 'Create Release' uses: softprops/action-gh-release@v1 From 8412e1e78c778ba19fb3af937c227467dea0a9c2 Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 15:45:44 -0500 Subject: [PATCH 7/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index 135e94593..5af95597d 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -80,4 +80,4 @@ jobs: tag_name: ${{steps.get_version.outputs.VERSION}} fail_on_unmatched_files: true files: | - '${{github.workspace}}/*.exe' + '${{github.workspace}}/build-windows/*.exe' From 2c78d84f41e9d027849c99159009f9c3042e6b7d Mon Sep 17 00:00:00 2001 From: radj307 Date: Wed, 16 Feb 2022 16:09:25 -0500 Subject: [PATCH 8/8] Update GenerateRelease-csharp.yml --- .github/workflows/GenerateRelease-csharp.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/GenerateRelease-csharp.yml b/.github/workflows/GenerateRelease-csharp.yml index 5af95597d..2b9f7dec0 100644 --- a/.github/workflows/GenerateRelease-csharp.yml +++ b/.github/workflows/GenerateRelease-csharp.yml @@ -71,6 +71,8 @@ jobs: uses: actions/download-artifact@v2 with: path: ${{github.workspace}} + + - run: ls -lAghR - name: 'Create Release' uses: softprops/action-gh-release@v1 @@ -80,4 +82,5 @@ jobs: tag_name: ${{steps.get_version.outputs.VERSION}} fail_on_unmatched_files: true files: | - '${{github.workspace}}/build-windows/*.exe' + ${{github.workspace}}/build-windows/VolumeControl.exe + ${{github.workspace}}/build-windows/VolumeControlCLI.exe