Skip to content

Commit

Permalink
Update bootstrap, jquery, copyright and local-mainsite link (#310)
Browse files Browse the repository at this point in the history 
* markdown linting, fix path to SCDF k8s installation guide
* disable search, toc tweaks
* disentangle from mainsite
* set max-width on images #163, #298

Co-authored-by: Bart Koelman <[email protected]>
  • Loading branch information
@TimHess @bart-vmware
TimHess and bart-vmware authored Feb 16, 2024
1 parent acc12e9 commit 5a96f33
Show file tree
Hide file tree
Showing 25 changed files with 1,463 additions and 2,446 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build-and-stage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ jobs:

- name: If PR, create a new staging slot
if: ${{ github.event_name == 'pull_request' }}
run: az webapp deployment slot create --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} --name ${{ vars.AZURE_WEBAPP_NAME}} --slot ${{ env.SLOT_NAME }}
run: az webapp deployment slot create --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} --name ${{ vars.AZURE_WEBAPP_NAME}} --slot ${{ env.SLOT_NAME }} --configuration-source ${{ vars.STAGING_SLOT_NAME }}

# Need to pair a PR slot with a custom MainSite address?
# az webapp config appsettings set -g steeltoe --name docs-steeltoe --slot pr-310 --settings mainsite_host=https://www-steeltoe-pr-141.azurewebsites.net

- name: Deploy to staging slot
uses: azure/webapps-deploy@v3
Expand Down
4 changes: 4 additions & 0 deletions .markdownlint.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"MD013": false,
"MD033": { "allowed_elements": ["img"] }
}
8 changes: 8 additions & 0 deletions api-filter.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
apiRules:
# Excluding types in global namespace, originating from Management/.../DotNetHeapDump
- exclude:
uidRegex: ^$
type: Namespace
# Excluding types in Graphs namespace, originating from Management/.../DotNetHeapDump
- exclude:
uidRegex: ^Graphs
type: Namespace
- exclude:
uidRegex: ^OpenCensus\.*
type: Namespace
Expand Down
332 changes: 147 additions & 185 deletions api-v2.json
View file
Original file line number Diff line number Diff line change
@@ -1,194 +1,156 @@
{
"metadata": [
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/CircuitBreaker/src"
}
],
"dest": "api/browser/v2/circuitbreaker",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/CircuitBreaker/src"
}
],
"dest": "api/browser/v2/circuitbreaker",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Common/src"
}
],
"dest": "api/browser/v2/common",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Common/src"
}
],
"dest": "api/browser/v2/common",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Configuration/src"
}
],
"dest": "api/browser/v2/configuration",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Configuration/src"
}
],
"dest": "api/browser/v2/configuration",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Connectors/src"
}
],
"dest": "api/browser/v2/connectors",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Connectors/src"
}
],
"dest": "api/browser/v2/connectors",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Discovery/src"
}
],
"dest": "api/browser/v2/discovery",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Discovery/src"
}
],
"dest": "api/browser/v2/discovery",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Integration/src"
}
],
"dest": "api/browser/v2/integration",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Logging/src"
}
],
"dest": "api/browser/v2/logging",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Logging/src"
}
],
"dest": "api/browser/v2/logging",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Management/src"
}
],
"dest": "api/browser/v2/management",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Management/src"
}
],
"dest": "api/browser/v2/management",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Security/src"
}
],
"dest": "api/browser/v2/security",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
},
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Stream/src"
}
],
"dest": "api/browser/v2/stream",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
}
]
}
{
"src": [
{
"files": [
"**/*.csproj"
],
"exclude": [ "**/bin/**", "**/obj/**" ],
"src": "sources/v2/src/Security/src"
}
],
"dest": "api/browser/v2/security",
"disableGitFeatures": false,
"disableDefaultFilter": false,
"filter": "api-filter.yml",
"properties": {
"TargetFramework": "netcoreapp3.1"
},
"version": "2.x"
}
]
}
Loading

0 comments on commit 5a96f33

Please sign in to comment.