From 85e629ae868071404a059ed5b197c15fb4a2f123 Mon Sep 17 00:00:00 2001 From: Xerbo Date: Sun, 22 Jan 2023 14:07:10 +0000 Subject: [PATCH 1/4] Fix release workflow --- .github/workflows/release.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b49e8d2..9a5a90a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,18 +59,27 @@ jobs: working-directory: ${{runner.workspace}}/build shell: bash # Execute the build. You can specify a specific target with "--target " - run: cmake --build . --config $BUILD_TYPE + run: cmake --build . --config $BUILD_TYPE && cmake --build . --target package - - name: Upload binary + - name: Upload TGZ package uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{runner.workspace}}/aptdec/build/aptdec - asset_name: aptdec_lin64 - asset_content_type: application/x-executable + asset_path: ./${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.tar.gz + asset_name: aptdec-${{ github.ref_name }}.x86_64.tar.gz + asset_content_type: application/gzip env: GITHUB_TOKEN: ${{ github.token }} + - name: Upload DEB package + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ needs.prepare_release.outputs.upload_url }} + asset_path: ./${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.deb + asset_name: aptdec-${{ github.ref_name }}.x86_64.deb + asset_content_type: application/vnd.debian.binary-package + env: + GITHUB_TOKEN: ${{ github.token }} build_windows: runs-on: ubuntu-latest @@ -94,8 +103,8 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{runner.workspace}}/aptdec/winbuild/aptdec-1.7.0.zip - asset_name: aptdec_win64.zip + asset_path: ./${{runner.workspace}}/aptdec/winbuild/aptdec-${{ github.ref_name }}.zip + asset_name: aptdec-${{ github.ref_name }}.zip asset_content_type: application/zip env: GITHUB_TOKEN: ${{ github.token }} From 59735c5f72ff388299bb90be4d7982b67ad4e46a Mon Sep 17 00:00:00 2001 From: Xerbo Date: Sun, 22 Jan 2023 14:12:34 +0000 Subject: [PATCH 2/4] Fix release workflow, again, and bump version number --- .github/workflows/release.yml | 6 +++--- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9a5a90a..e3d8755 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.tar.gz + asset_path: ${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.tar.gz asset_name: aptdec-${{ github.ref_name }}.x86_64.tar.gz asset_content_type: application/gzip env: @@ -75,7 +75,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.deb + asset_path: ${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.deb asset_name: aptdec-${{ github.ref_name }}.x86_64.deb asset_content_type: application/vnd.debian.binary-package env: @@ -103,7 +103,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{runner.workspace}}/aptdec/winbuild/aptdec-${{ github.ref_name }}.zip + asset_path: ${{runner.workspace}}/aptdec/winbuild/aptdec-${{ github.ref_name }}.zip asset_name: aptdec-${{ github.ref_name }}.zip asset_content_type: application/zip env: diff --git a/CMakeLists.txt b/CMakeLists.txt index 45e1761..9076b62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ else() endif() # TODO: get this from git -set(PROJECT_VERSION "1.7.0") +set(PROJECT_VERSION "1.8.0") # CPack set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") From cf12d0754d700d31041b0fde3191a5c1e3cca328 Mon Sep 17 00:00:00 2001 From: Xerbo Date: Sun, 22 Jan 2023 14:20:58 +0000 Subject: [PATCH 3/4] Fix release workflow and bump version number, again --- .github/workflows/release.yml | 6 +++--- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3d8755..e1dfd6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.tar.gz + asset_path: ${{runner.workspace}}/build/aptdec-${{ github.ref_name }}.x86_64.tar.gz asset_name: aptdec-${{ github.ref_name }}.x86_64.tar.gz asset_content_type: application/gzip env: @@ -75,7 +75,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ${{runner.workspace}}/aptdec/build/aptdec-${{ github.ref_name }}.x86_64.deb + asset_path: ${{runner.workspace}}/build/aptdec-${{ github.ref_name }}.x86_64.deb asset_name: aptdec-${{ github.ref_name }}.x86_64.deb asset_content_type: application/vnd.debian.binary-package env: @@ -103,7 +103,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ${{runner.workspace}}/aptdec/winbuild/aptdec-${{ github.ref_name }}.zip + asset_path: ${{runner.workspace}}/winbuild/aptdec-${{ github.ref_name }}.zip asset_name: aptdec-${{ github.ref_name }}.zip asset_content_type: application/zip env: diff --git a/CMakeLists.txt b/CMakeLists.txt index 9076b62..c0b13fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ else() endif() # TODO: get this from git -set(PROJECT_VERSION "1.8.0") +set(PROJECT_VERSION "v1.8.0") # CPack set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") From 57271c33b9ccf9572d3239cd3394a0b1762d3d86 Mon Sep 17 00:00:00 2001 From: Xerbo Date: Sun, 22 Jan 2023 14:33:11 +0000 Subject: [PATCH 4/4] I don't even know anymore --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1dfd6b..a441c92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,7 +103,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ${{runner.workspace}}/winbuild/aptdec-${{ github.ref_name }}.zip + asset_path: ${{runner.workspace}}/aptdec/winbuild/aptdec-${{ github.ref_name }}.zip asset_name: aptdec-${{ github.ref_name }}.zip asset_content_type: application/zip env: