diff --git a/.github/workflows/ci-linux.json b/.github/workflows/ci-linux.json index 99b814c8a..01cd778ad 100644 --- a/.github/workflows/ci-linux.json +++ b/.github/workflows/ci-linux.json @@ -4,19 +4,19 @@ "name": "debian-13-amd64", "container": "deskflow/deskflow:debian-13-amd64", "runs-on": "ubuntu-latest", - "extra-packages": true + "extra-packages": false }, { "name": "debian-12-arm64", "container": "deskflow/deskflow:debian-12-arm64", "runs-on": "ubuntu-24.04-4-core-arm64", - "extra-packages": true + "extra-packages": false }, { "name": "debian-12-amd64", "container": "deskflow/deskflow:debian-12-amd64", "runs-on": "ubuntu-latest", - "extra-packages": true + "extra-packages": false }, { "name": "ubuntu-24.04-amd64", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adca2c161..2d3321ae2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -197,7 +197,7 @@ jobs: - name: Upload uses: actions/upload-artifact@v4 with: - name: ${{ env.PACKAGE_PREFIX }}-${{ matrix.target.name }} + name: package-${{ env.PACKAGE_PREFIX }}-${{ matrix.target.name }} path: ${{ env.PACKAGE_PATH }} macos: @@ -270,7 +270,7 @@ jobs: - name: Upload uses: actions/upload-artifact@v4 with: - name: ${{ env.PACKAGE_PREFIX }}-${{ matrix.target.name }} + name: package-${{ env.PACKAGE_PREFIX }}-${{ matrix.target.name }} path: ${{ env.PACKAGE_PATH }} linux-matrix: @@ -341,7 +341,7 @@ jobs: - name: Upload uses: actions/upload-artifact@v4 with: - name: ${{ env.PACKAGE_PREFIX }}-${{ matrix.distro.name }} + name: package-${{ env.PACKAGE_PREFIX }}-${{ matrix.distro.name }} path: ${{ env.PACKAGE_PATH }} # Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived". @@ -377,3 +377,31 @@ jobs: with: usesh: true run: ${{ env.DESKFLOW_BUILD_CMD }} + + release_assets: + name: Release + needs: [windows, linux, macos] + runs-on: ubuntu-latest + steps: + - name: Download Files + uses: actions/download-artifact@v4 + + - name: Deploy Continuous + if: (github.ref == 'refs/heads/master') && !(contains(github.ref, '/tags/v')) + uses: crowbarmaster/GH-Automatic-Releases@latest + with: + repo_token: "${{ secrets.DEPLOY_TOKEN }}" + automatic_release_tag: "continuous" + prerelease: false + title: "Continuous Build" + files: | + package-*/* + + - name: Deploy Release + if: contains(github.ref, '/tags/v') + uses: crowbarmaster/GH-Automatic-Releases@latest + with: + repo_token: "${{ secrets.DEPLOY_TOKEN }}" + prerelease: false + files: | + package-*/* diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index 82df12bef..88a9551b5 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -100,7 +100,7 @@ macro(configure_linux_packaging) message(VERBOSE "Configuring Linux packaging") set(CPACK_PACKAGE_VERSION ${DESKFLOW_VERSION_LINUX}) - set(CPACK_GENERATOR "DEB;RPM;TGZ") + set(CPACK_GENERATOR "DEB;RPM") set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${DESKFLOW_MAINTAINER}) set(CPACK_DEBIAN_PACKAGE_SECTION "utils")