Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions .github/workflows/apphost-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,8 @@ permissions:

jobs:
build:
name: ${{ matrix.apphost.name }} Build
name: AppHost Build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
apphost:
- name: AppHost
project_name: Aspire.Dev.AppHost
project_path: src/apphost/Aspire.Dev.AppHost
artifact_name: apphost-release
- name: Preview AppHost
project_name: Aspire.Dev.Preview.AppHost
project_path: src/apphost/Aspire.Dev.Preview.AppHost
artifact_name: preview-apphost-release
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

Expand All @@ -30,17 +18,17 @@ jobs:
global-json-file: global.json

- name: Restore
run: cd ${{ matrix.apphost.project_path }} && dotnet restore
run: cd src/apphost/Aspire.Dev.AppHost && dotnet restore

- name: Build
run: cd ${{ matrix.apphost.project_path }} && dotnet build --no-restore --configuration Release
run: cd src/apphost/Aspire.Dev.AppHost && dotnet build --no-restore --configuration Release

- name: Verify output
run: |
APPHOST_DLL=$(ls -1 ${{ matrix.apphost.project_path }}/bin/Release/*/${{ matrix.apphost.project_name }}.dll 2>/dev/null | head -n 1)
APPHOST_DLL=$(ls -1 src/apphost/Aspire.Dev.AppHost/bin/Release/*/Aspire.Dev.AppHost.dll 2>/dev/null | head -n 1)
if [ -z "$APPHOST_DLL" ]; then
echo "AppHost build failed - output assembly not found"
ls -R ${{ matrix.apphost.project_path }}/bin/Release || true
ls -R src/apphost/Aspire.Dev.AppHost/bin/Release || true
exit 1
fi
echo "Found $APPHOST_DLL"
Expand All @@ -49,7 +37,7 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
with:
name: ${{ matrix.apphost.artifact_name }}
path: ${{ matrix.apphost.project_path }}/bin/Release/*/
name: apphost-release
path: src/apphost/Aspire.Dev.AppHost/bin/Release/*/
if-no-files-found: warn
retention-days: 7
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ jobs:
uses: ./.github/workflows/frontend-build.yml
with:
node_version: '24.x'
artifact_name: ${{ github.event_name == 'pull_request' && format('frontend-dist-pr-{0}', github.event.pull_request.number) || 'frontend-dist' }}
artifact_retention_days: ${{ github.event_name == 'pull_request' && 30 || 7 }}
site_base_path: ${{ github.event_name == 'pull_request' && format('/prs/{0}', github.event.pull_request.number) || '/' }}

apphost-build:
needs: changes
Expand Down
20 changes: 2 additions & 18 deletions .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,6 @@ on:
required: true
default: "24.x"
type: string
artifact_name:
description: Artifact name to publish
required: false
default: "frontend-dist"
type: string
artifact_retention_days:
description: Number of days to keep the uploaded artifact
required: false
default: 7
type: number
site_base_path:
description: Path base to use for the Astro build
required: false
default: "/"
type: string

permissions:
contents: read
Expand Down Expand Up @@ -56,7 +41,6 @@ jobs:
env:
MODE: production
ASTRO_TELEMETRY_DISABLED: 1
ASTRO_BASE_PATH: ${{ inputs.site_base_path }}
run: pnpm build:production

- name: Check dist
Expand All @@ -77,7 +61,7 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
with:
name: ${{ inputs.artifact_name }}
name: frontend-dist
path: src/frontend/dist
if-no-files-found: warn
retention-days: ${{ inputs.artifact_retention_days }}
retention-days: 7
54 changes: 0 additions & 54 deletions .github/workflows/pr-preview-cleanup.yml

This file was deleted.

149 changes: 0 additions & 149 deletions .github/workflows/pr-preview-register.yml

This file was deleted.

2 changes: 0 additions & 2 deletions Aspire.Dev.slnx
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<Solution>
<Folder Name="/apphost/">
<Project Path="src/apphost/Aspire.Dev.AppHost/Aspire.Dev.AppHost.csproj" />
<Project Path="src/apphost/Aspire.Dev.Preview.AppHost/Aspire.Dev.Preview.AppHost.csproj" />
</Folder>
<Folder Name="/statichost/">
<Project Path="src/statichost/StaticHost/StaticHost.csproj" />
<Project Path="src/statichost/PreviewHost/PreviewHost.csproj" />
</Folder>
<Project Path="src/frontend/frontend.esproj">
<Build />
Expand Down
35 changes: 0 additions & 35 deletions src/apphost/Aspire.Dev.Preview.AppHost/AppHost.cs

This file was deleted.

This file was deleted.

Loading
Loading