Skip to content

Commit 40bf4d7

Browse files
IEvangelistCopilot
andauthored
Revert "Add an AppHost and PreviewHost for serving site previews" (#642)
This reverts the changes introduced by PR #641, restoring the repository to the pre-merge main tree at 0642409. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent fd35839 commit 40bf4d7

35 files changed

+9
-7583
lines changed

.github/workflows/apphost-build.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ permissions:
88

99
jobs:
1010
build:
11-
name: ${{ matrix.apphost.name }} Build
11+
name: AppHost Build
1212
runs-on: ubuntu-latest
13-
strategy:
14-
fail-fast: false
15-
matrix:
16-
apphost:
17-
- name: AppHost
18-
project_name: Aspire.Dev.AppHost
19-
project_path: src/apphost/Aspire.Dev.AppHost
20-
artifact_name: apphost-release
21-
- name: Preview AppHost
22-
project_name: Aspire.Dev.Preview.AppHost
23-
project_path: src/apphost/Aspire.Dev.Preview.AppHost
24-
artifact_name: preview-apphost-release
2513
steps:
2614
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2715

@@ -30,17 +18,17 @@ jobs:
3018
global-json-file: global.json
3119

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

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

3826
- name: Verify output
3927
run: |
40-
APPHOST_DLL=$(ls -1 ${{ matrix.apphost.project_path }}/bin/Release/*/${{ matrix.apphost.project_name }}.dll 2>/dev/null | head -n 1)
28+
APPHOST_DLL=$(ls -1 src/apphost/Aspire.Dev.AppHost/bin/Release/*/Aspire.Dev.AppHost.dll 2>/dev/null | head -n 1)
4129
if [ -z "$APPHOST_DLL" ]; then
4230
echo "AppHost build failed - output assembly not found"
43-
ls -R ${{ matrix.apphost.project_path }}/bin/Release || true
31+
ls -R src/apphost/Aspire.Dev.AppHost/bin/Release || true
4432
exit 1
4533
fi
4634
echo "Found $APPHOST_DLL"
@@ -49,7 +37,7 @@ jobs:
4937
if: ${{ always() }}
5038
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5139
with:
52-
name: ${{ matrix.apphost.artifact_name }}
53-
path: ${{ matrix.apphost.project_path }}/bin/Release/*/
40+
name: apphost-release
41+
path: src/apphost/Aspire.Dev.AppHost/bin/Release/*/
5442
if-no-files-found: warn
5543
retention-days: 7

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ jobs:
6868
uses: ./.github/workflows/frontend-build.yml
6969
with:
7070
node_version: '24.x'
71-
artifact_name: ${{ github.event_name == 'pull_request' && format('frontend-dist-pr-{0}', github.event.pull_request.number) || 'frontend-dist' }}
72-
artifact_retention_days: ${{ github.event_name == 'pull_request' && 30 || 7 }}
73-
site_base_path: ${{ github.event_name == 'pull_request' && format('/prs/{0}', github.event.pull_request.number) || '/' }}
7471

7572
apphost-build:
7673
needs: changes

.github/workflows/frontend-build.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ on:
88
required: true
99
default: "24.x"
1010
type: string
11-
artifact_name:
12-
description: Artifact name to publish
13-
required: false
14-
default: "frontend-dist"
15-
type: string
16-
artifact_retention_days:
17-
description: Number of days to keep the uploaded artifact
18-
required: false
19-
default: 7
20-
type: number
21-
site_base_path:
22-
description: Path base to use for the Astro build
23-
required: false
24-
default: "/"
25-
type: string
2611

2712
permissions:
2813
contents: read
@@ -56,7 +41,6 @@ jobs:
5641
env:
5742
MODE: production
5843
ASTRO_TELEMETRY_DISABLED: 1
59-
ASTRO_BASE_PATH: ${{ inputs.site_base_path }}
6044
run: pnpm build:production
6145

6246
- name: Check dist
@@ -77,7 +61,7 @@ jobs:
7761
if: ${{ always() }}
7862
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7963
with:
80-
name: ${{ inputs.artifact_name }}
64+
name: frontend-dist
8165
path: src/frontend/dist
8266
if-no-files-found: warn
83-
retention-days: ${{ inputs.artifact_retention_days }}
67+
retention-days: 7

.github/workflows/pr-preview-cleanup.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/pr-preview-register.yml

Lines changed: 0 additions & 149 deletions
This file was deleted.

Aspire.Dev.slnx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<Solution>
22
<Folder Name="/apphost/">
33
<Project Path="src/apphost/Aspire.Dev.AppHost/Aspire.Dev.AppHost.csproj" />
4-
<Project Path="src/apphost/Aspire.Dev.Preview.AppHost/Aspire.Dev.Preview.AppHost.csproj" />
54
</Folder>
65
<Folder Name="/statichost/">
76
<Project Path="src/statichost/StaticHost/StaticHost.csproj" />
8-
<Project Path="src/statichost/PreviewHost/PreviewHost.csproj" />
97
</Folder>
108
<Project Path="src/frontend/frontend.esproj">
119
<Build />

src/apphost/Aspire.Dev.Preview.AppHost/AppHost.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/apphost/Aspire.Dev.Preview.AppHost/Aspire.Dev.Preview.AppHost.csproj

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)