diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 575f92d3c6..63a320ce9e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -158,7 +158,7 @@ jobs: SECRET=$(echo $SECRET_JSON | jq -r '.spec.secrets[0].secret') echo "Secret: $SECRET" echo "Hostname: $(hostname -s)" - fleetctl package --type pkg --fleet-url=${{ needs.gen.outputs.address }} --enroll-secret=$SECRET --orbit-channel=${{ matrix.orbit-channel }} --osqueryd-channel=${{ matrix.osqueryd-channel }} + fleetctl package --type pkg --fleet-url=${{ needs.gen.outputs.address }} --enroll-secret=$SECRET --orbit-channel=${{ matrix.orbit-channel }} --osqueryd-channel=${{ matrix.osqueryd-channel }} --fleet-desktop sudo installer -pkg fleet-osquery.pkg -target / until fleetctl get hosts | grep -iF $(hostname -s); do @@ -230,7 +230,7 @@ jobs: SECRET=$(echo $SECRET_JSON | jq -r '.spec.secrets[0].secret') echo "Secret: $SECRET" echo "Hostname: $(hostname -s)" - fleetctl package --type msi --fleet-url=${{ needs.gen.outputs.address }} --enroll-secret=$SECRET --orbit-channel=${{ matrix.orbit-channel }} --osqueryd-channel=${{ matrix.osqueryd-channel }} + fleetctl package --type msi --fleet-url=${{ needs.gen.outputs.address }} --enroll-secret=$SECRET --orbit-channel=${{ matrix.orbit-channel }} --osqueryd-channel=${{ matrix.osqueryd-channel }} --fleet-desktop mv fleet-osquery.msi orbit-${{ matrix.orbit-channel }}-osqueryd-${{ matrix.osqueryd-channel }}.msi - name: Upload MSI diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 875623c8ba..784966be18 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -1,5 +1,10 @@ name: Test packaging +# This workflow tests packaging of Fleet-osquery with the +# `fleetctl package' command. It fetches the targets: orbit, +# osquery and fleet-desktop from the default (Fleet's) TUF server, +# https://tuf.fleetctl.com. + on: push: branches: @@ -8,6 +13,8 @@ on: pull_request: paths: - '**.go' + - '.github/workflows/test-packaging.yml' + workflow_dispatch: # Manual permissions: contents: read @@ -61,5 +68,11 @@ jobs: - name: Build MSI run: ./build/fleetctl package --type msi --enroll-secret=foo --fleet-url=https://localhost:8080 + - name: Build MSI with Fleet Desktop + run: ./build/fleetctl package --type msi --enroll-secret=foo --fleet-url=https://localhost:8080 --fleet-desktop + - name: Build PKG run: ./build/fleetctl package --type pkg --enroll-secret=foo --fleet-url=https://localhost:8080 + + - name: Build PKG with Fleet Desktop + run: ./build/fleetctl package --type pkg --enroll-secret=foo --fleet-url=https://localhost:8080 --fleet-desktop