Skip to content

Commit

Permalink
Migrate repository to match new Starter Kit structure (#481)
Browse files Browse the repository at this point in the history
* Initial move of assets to new repo structure

* Updated docker assets to match new structure, simplified docker build process, updated docker scripts

* Restructured SCS items

* Fixed API Key generation for SUGCON Sites

* Split dotnet solutions between authoring and MVP, both now load and run

* Updated READMEs and docker init script

* Updated GitHub Actions to match new repository structure

* Updated xmcloud.build.json to update reference to authoring projects

* Updated publish location for MVP CI-CD

* Updated README

* Added try-catch to up.ps1 to return user to correct dir on error

* Various Fixes

+ Docker ignore fix
+ gitignore fix
+ env template typo fix
+ SignIn restore

* Removed and ignored appsettings.development.json

* Updated README

* Missing MVP logos

---------

Co-authored-by: Ivan Lieckens <[email protected]>
  • Loading branch information
robearlam and IvanLieckens committed Sep 25, 2024
1 parent 2f37090 commit ba5c505
Show file tree
Hide file tree
Showing 3,509 changed files with 21,606 additions and 21,958 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.sitecore
build
docker
local-containers
packages
**/bin/
**/obj/
Expand All @@ -24,4 +25,7 @@ docker-compose*
scjssconfig.json
**/*.yml
**/*.module.json
**/*.user
**/*.suo
**/*.scindex
sitecore.json
9 changes: 5 additions & 4 deletions .github/workflows/CI-CD_MVP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,30 @@ on:
- .github/workflows/CI-CD_MVP.yml
- .github/workflows/build_DotNet.yml
- .github/workflows/deploy_azureWebapp.yml
- 'src/**/rendering/**'
- 'headapps/MvpSite/**'
pull_request:
branches: [ main ]
paths:
- .github/workflows/CI-CD_MVP.yml
- .github/workflows/build_DotNet.yml
- .github/workflows/deploy_azureWebapp.yml
- 'src/**/rendering/**'
- 'headapps/MvpSite/**'

jobs:

build-dotnet:
uses: ./.github/workflows/build_DotNet.yml
with:
buildConfiguration: Release
solution: headapps/MvpSite/XMC-Introduction-MVP.sln

deploy-mvp-staging:
uses: ./.github/workflows/deploy_azureWebapp.yml
needs: build-dotnet
if: github.repository_owner == 'Sitecore' && ((github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'push') || (github.event_name == 'workflow_dispatch'))
with:
buildConfiguration: Debug
projectLocation: src/Project/MvpSite/rendering
projectLocation: headapps/MvpSite/Mvp.Project.MvpSite.Rendering
assetName: Mvp-Staging
webAppName: Mvp-Staging
secrets:
Expand All @@ -41,7 +42,7 @@ jobs:
uses: ./.github/workflows/deploy_azureWebapp.yml
with:
buildConfiguration: Release
projectLocation: src/Project/MvpSite/rendering
projectLocation: headapps/MvpSite/Mvp.Project.MvpSite.Rendering
assetName: Mvp-prod
webAppName: Mvp-Production
secrets:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/CI-CD_SUGCON_24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ on:
- .github/workflows/CI-CD_SUGCON_24.yml
- .github/workflows/build_NextJs.yml
- .github/workflows/deploy_vercel.yml
- 'src/Project/Sugcon2024/Sugcon/**'
- 'headapps/Sugcon2024/**'
pull_request:
branches: [ main ]
paths:
- .github/workflows/CI-CD_SUGCON_24.yml
- .github/workflows/build_NextJs.yml
- .github/workflows/deploy_vercel.yml
- 'src/Project/Sugcon2024/Sugcon/**'
- 'headapps/Sugcon2024/**'

jobs:

build-sugcon24-site:
if: github.ref != 'refs/heads/main'
uses: ./.github/workflows/build_NextJs.yml
with:
workingDirectory: ./src/Project/Sugcon2024/Sugcon
workingDirectory: ./headapps/Sugcon2024

deploy-sugcon24-site:
uses: ./.github/workflows/deploy_vercel.yml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/CI-CD_SUGCON_24_STORYBOOK.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ on:
- .github/workflows/CI-CD_SUGCON_24_STORYBOOK.yml
- .github/workflows/build_NextJs.yml
- .github/workflows/deploy_vercel.yml
- 'src/Project/Sugcon2024/Sugcon/**'
- 'headapps/Sugcon2024/**'
pull_request:
branches: [ main ]
paths:
- .github/workflows/CI-CD_SUGCON_24_STORYBOOK.yml
- .github/workflows/build_NextJs.yml
- .github/workflows/deploy_vercel.yml
- 'src/Project/Sugcon2024/Sugcon/**'
- 'headapps/Sugcon2024/**'

jobs:

build-sugcon24-storybook:
if: github.ref != 'refs/heads/main'
uses: ./.github/workflows/build_NextJs_Storybook.yml
with:
workingDirectory: ./src/Project/Sugcon2024/Sugcon
workingDirectory: ./headapps/Sugcon2024

deploy-sugcon24-storybook:
uses: ./.github/workflows/deploy_vercel.yml
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/CI-CD_XM_Cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,25 @@ on:
- .github/workflows/deploy_xmCloud.yml
- .github/workflows/build_DotNet.yml
- 'xmcloud.build.json'
- 'src/**/platform/**'
- 'src/**/items/**'
- 'src/Project/Sugcon2024/**'
- 'src/Project/Sugcon/**'
- 'authoring/**'
- 'headapps/Sugcon2024/**'
pull_request:
branches: [ main ]
paths:
- .github/workflows/CI-CD_XM_Cloud.yml
- .github/workflows/deploy_xmCloud.yml
- .github/workflows/build_DotNet.yml
- 'xmcloud.build.json'
- 'src/**/platform/**'
- 'src/**/items/**'
- 'src/Project/Sugcon2024/**'
- 'src/Project/Sugcon/**'
- 'authoring/**'
- 'headapps/Sugcon2024/**'

jobs:

build-dotnet:
uses: ./.github/workflows/build_DotNet.yml
with:
buildConfiguration: Release
solution: authoring/platform/XMC-Introduction-Authoring.sln

deploy-staging:
uses: ./.github/workflows/deploy_xmCloud.yml
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build_DotNet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
buildConfiguration:
required: true
type: string
solution:
required: true
type: string

jobs:
build-dotnet:
Expand All @@ -20,6 +23,6 @@ jobs:
- name: Setup NuGet
uses: NuGet/[email protected]
- name: Restore NuGet packages
run: nuget restore src\XmCloudIntroduction.sln
run: nuget restore ${{ inputs.solution }}
- name: Build
run: msbuild src\XmCloudIntroduction.sln /p:Configuration=${{ inputs.buildConfiguration }}
run: msbuild ${{ inputs.solution }} /p:Configuration=${{ inputs.buildConfiguration }}
2 changes: 1 addition & 1 deletion .github/workflows/deploy_azureWebapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
cd ${{ inputs.projectLocation }}
dotnet restore
dotnet build --configuration ${{ inputs.buildConfiguration }}
dotnet publish -c ${{ inputs.buildConfiguration }} -o '../../../../publish/${{ inputs.assetName }}'
dotnet publish -c ${{ inputs.buildConfiguration }} -o '../../../publish/${{ inputs.assetName }}'
- name: 'Run Azure webapp deploy action using publish profile credentials'
uses: azure/webapps-deploy@v2
with:
Expand Down
21 changes: 6 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Thumbs.db
*.exe
*.pdb
*.user
# Make exception for Feature.User folder
!authoring/items/Mvp/Feature.User
*.aps
*.pch
*.vspscc
Expand Down Expand Up @@ -46,19 +48,8 @@ _ReSharper*/
# Nuget packages folder
packages/

# Docker folders
/docker/data/cm/*
!/docker/data/cm/.gitkeep
/docker/data/sql/*
!/docker/data/sql/.gitkeep
/docker/data/solr/*
!/docker/data/solr/.gitkeep
/docker/deploy/platform/*
!/docker/deploy/platform/.gitkeep
/docker/deploy/mvp-rendering/*
!/docker/deploy/mvp-rendering/.gitkeep
/docker/traefik/certs/*.pem
/docker/build/*

.vercel
xmcloud.plugin.pre-release.json
xmcloud.plugin.pre-release.json

# developer configs
headapps/MvpSite/Mvp.Project.MvpSite.Rendering/appsettings.Development.json
Loading

0 comments on commit ba5c505

Please sign in to comment.