-
Notifications
You must be signed in to change notification settings - Fork 35
merging master into experiimental #351
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: Experimental
Are you sure you want to change the base?
Changes from all commits
7d6b48b
0d65d67
31cc3e9
271cb7a
761e920
c83cb42
c90af0a
02db5c4
10498e3
21a6d91
c617160
65c390e
8102921
f2fd4f7
3854d76
f6ab872
37c0277
285bdf2
9d4c159
7f58dc4
8e155ce
29afc96
0f32669
9c232a9
9927686
a7a013d
89f3e2c
7a9f539
0775ba0
2d894bd
d98ed0c
bb7481b
0f69668
54d065a
725cb1f
ad69723
32d32b6
da7717b
7bad493
4df1863
f9dfff3
57d9611
ff98548
08a882c
913e73d
8d31b54
8badf8b
c8868ab
10db08d
22ce59c
7fb9e91
3d92c45
5b46af8
ebc17c3
56d8eba
0a5b909
5a0034a
628029a
d62ecc1
a8c5fa1
157b3d3
1c025e2
a5552e5
363b940
0af58be
4783f8a
dd76e6b
74fb9c8
f676c63
e17e742
6221b47
ab0d456
1ed2012
605ab54
9efff2a
46ae8cc
356c079
351bedb
652c449
655dacb
b42369d
85f49a4
d40fa35
d4791fc
df02fcb
aa1de93
0491dbf
010e092
9dccda7
209eb9c
c5f5581
0fb162f
cd367b1
ee17887
07fc268
e78e743
e0aeaeb
5a35180
a31c318
7537545
d80669b
461e83b
05a069e
530733d
5a025b6
779032b
9af4470
d0a39a2
a23a86c
d2a4f1b
c84baa5
eb9ce58
3e93593
c087188
7ad2df8
6eac500
31ea975
f1717eb
f065ac6
88b2e55
6d7bec1
88929ec
7d203f3
38733e1
d05c352
903f245
56ece2d
f54e402
6766c4d
68fb5aa
e97099d
39aca74
05ab70e
dbc48bc
1dc0518
4c22720
2c5a6bb
afa2bca
3b70c6f
297763a
be6131a
dd86421
becf01e
0c306f5
8cb94d0
daf8601
49d7d97
9258aad
7f8bdd7
44ee94a
c846789
635b7b4
d57f956
480ccba
3462cab
774ff2a
b35c568
462baed
c62779d
e2a1cfa
b545ead
891f454
caa859a
1d6eddd
9fa1c01
a710e0a
cd6b4b7
45a4a25
4df6721
4bdad7a
54d9776
757b27d
8e407f5
c810ee2
5747d32
8bd93df
4144f74
f54b6c8
f562f36
2682d9c
262bc97
d019ed3
2d80911
dbb0417
a5200e1
293ef74
65b0bc9
da75573
ab345d2
c8245dd
1ac18d4
0cb7898
668bd71
47e8db8
1e14555
46c68b9
cfb64f2
56c5c0e
a746ca6
3282e35
7cdf353
0d57dda
78d05ff
6036fbe
3301ad3
6409b51
346e11e
7715060
8ef79ef
f6dfde9
f93bc43
bd48c1c
b7d4cca
4ffef28
523c2cb
7e9e12b
e552790
cfb8185
3211b00
3b6cd37
9aafc98
142fd34
3903d58
72f6eb5
5d04654
22f2e9e
3a07da8
a80f86a
a2a6e0a
a7355ff
cdc37b4
8693088
6cbd43b
616e9c8
6100ac7
42043f9
af7e78c
1f3f1b1
f1890e2
2565afb
f539858
cfaa9c6
6be6b37
f71897a
91ba19a
d90deee
e07d2f2
48dbd90
db3d9f0
40da256
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "version": "0.0.1", | ||
| "configurations": [ | ||
| { | ||
| "name": "Web6Site", | ||
| "runtimeExecutable": "npx", | ||
| "runtimeArgs": ["serve", "-p", "5173", "C:\\Source\\Web6Site"], | ||
| "port": 5173 | ||
| } | ||
| ] | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "repo_notes": [ | ||
| { | ||
| "content": "Use api.oasisweb4.one (not .com) as the canonical base URL for the hosted OASIS API in all examples, code snippets, and documentation. Base URL: https://api.oasisweb4.one, API prefix: https://api.oasisweb4.one/api, Swagger: https://api.oasisweb4.one/swagger/index.html.\n\nIn the Getting Started / Developer Guides section, document both paths clearly:\n1. Using the remote API: Users can call the hosted API at https://api.oasisweb4.one without cloning or running the repo. Include: register (POST /api/avatar/register), verify-email, authenticate (POST /api/avatar/authenticate), then use the JWT in Authorization header for other endpoints. No .NET SDK or local setup required.\n2. Running locally: Clone, restore, build, and run the WebAPI project for local development.", | ||
| "author": "OASIS docs" | ||
| } | ||
| ], | ||
| "pages": [] | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -137,6 +137,31 @@ jobs: | |
| dotnet test "STAR ODK/NextGenSoftware.OASIS.STAR.WebAPI.IntegrationTests/NextGenSoftware.OASIS.STAR.WebAPI.IntegrationTests.csproj" --no-build --verbosity normal | ||
| dotnet test "STAR ODK/NextGenSoftware.OASIS.STAR.WebUI.IntegrationTests/NextGenSoftware.OASIS.STAR.WebUI.IntegrationTests.csproj" --no-build --verbosity normal | ||
|
|
||
| # STARAPIClient Unit + Integration + Harness | ||
| test-starapi-client: | ||
| name: Test STARAPIClient | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: ${{ env.DOTNET_VERSION }} | ||
|
|
||
| - name: Run STARAPIClient test suite | ||
| shell: pwsh | ||
| run: | | ||
| & "OASIS Omniverse/STARAPIClient/run_star_api_test_suite.ps1" -Configuration Release -KillStaleTestHosts $true | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. STARAPIClient tests likely fail on UbuntuHigh Severity The new Additional Locations (1) |
||
| - name: Upload STARAPIClient test artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| if: always() | ||
| with: | ||
| name: starapiclient-test-results | ||
| path: OASIS Omniverse/STARAPIClient/TestResults/ | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. CI artifact upload path with spaces needs quotingMedium Severity The There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Artifact upload path with spaces needs quotingMedium Severity The |
||
| retention-days: 30 | ||
|
|
||
| # Unity Tests (if Unity is available) | ||
| unity-tests: | ||
| name: Unity Tests | ||
|
|
@@ -160,7 +185,7 @@ jobs: | |
| build-and-package: | ||
| name: Build and Package | ||
| runs-on: ubuntu-latest | ||
| needs: [test-oasis-architecture, test-onode, test-star-odk, integration-tests] | ||
| needs: [test-oasis-architecture, test-onode, test-star-odk, integration-tests, test-starapi-client] | ||
| if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' | ||
|
|
||
| steps: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy | ||
| # More GitHub Actions for Azure: https://github.com/Azure/actions | ||
|
|
||
| name: Build and deploy ASP.Net Core app to Azure Web App - OASISAPIONODE | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: windows-latest | ||
| permissions: | ||
| contents: read #This is required for actions/checkout | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up .NET Core | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: '10.x' | ||
|
|
||
| - name: Build with dotnet | ||
| run: dotnet build --configuration Release | ||
|
|
||
| - name: dotnet publish | ||
| run: dotnet publish -c Release -o "${{env.DOTNET_ROOT}}/myapp" | ||
|
|
||
| - name: Upload artifact for deployment job | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: .net-app | ||
| path: ${{env.DOTNET_ROOT}}/myapp | ||
|
|
||
| deploy: | ||
| runs-on: windows-latest | ||
| needs: build | ||
| permissions: | ||
| id-token: write #This is required for requesting the JWT | ||
| contents: read #This is required for actions/checkout | ||
|
|
||
| steps: | ||
| - name: Download artifact from build job | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: .net-app | ||
|
|
||
| - name: Login to Azure | ||
| uses: azure/login@v2 | ||
| with: | ||
| client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_6E57E8EB6CA44C78B5CE4C7C568A0523 }} | ||
| tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_BE062CE2CBC344DFA6587A6106793B05 }} | ||
| subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_AD923DCFBB8745FE900FC743D8F58F66 }} | ||
|
|
||
| - name: Deploy to Azure Web App | ||
| id: deploy-to-webapp | ||
| uses: azure/webapps-deploy@v3 | ||
| with: | ||
| app-name: 'OASISAPIONODE' | ||
| slot-name: 'Production' | ||
| package: . | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| name: ONET/ONODE Tests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master, Development ] | ||
| paths: | ||
| - 'ONODE/**' | ||
| - 'OASIS Architecture/NextGenSoftware.OASIS.API.DNA/**' | ||
| pull_request: | ||
| branches: [ master ] | ||
| paths: | ||
| - 'ONODE/**' | ||
| - 'OASIS Architecture/NextGenSoftware.OASIS.API.DNA/**' | ||
|
|
||
| env: | ||
| DOTNET_VERSION: '10.0.x' | ||
|
|
||
| jobs: | ||
| unit-tests: | ||
| name: ONET/ONODE Unit Tests | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: ${{ env.DOTNET_VERSION }} | ||
|
|
||
| - name: Restore | ||
| run: dotnet restore "ONODE/NextGenSoftware.OASIS.API.ONODE.Core.UnitTests/NextGenSoftware.OASIS.API.ONODE.Core.Tests/NextGenSoftware.OASIS.API.ONODE.Core.Tests.csproj" | ||
|
|
||
| - name: Build | ||
| run: dotnet build "ONODE/NextGenSoftware.OASIS.API.ONODE.Core.UnitTests/NextGenSoftware.OASIS.API.ONODE.Core.Tests/NextGenSoftware.OASIS.API.ONODE.Core.Tests.csproj" --no-restore | ||
|
|
||
| - name: Run unit tests | ||
| run: dotnet test "ONODE/NextGenSoftware.OASIS.API.ONODE.Core.UnitTests/NextGenSoftware.OASIS.API.ONODE.Core.Tests/NextGenSoftware.OASIS.API.ONODE.Core.Tests.csproj" --no-build --logger "trx;LogFileName=unit-results.trx" --results-directory TestResults | ||
|
|
||
| - name: Upload unit test results | ||
| uses: actions/upload-artifact@v4 | ||
| if: always() | ||
| with: | ||
| name: unit-test-results | ||
| path: TestResults/unit-results.trx | ||
|
|
||
| integration-tests: | ||
| name: ONET/ONODE Integration Tests | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: ${{ env.DOTNET_VERSION }} | ||
|
|
||
| - name: Restore | ||
| run: dotnet restore "ONODE/NextGenSoftware.OASIS.API.ONODE.Core.IntegrationTests/NextGenSoftware.OASIS.API.ONODE.Core.IntegrationTests.csproj" | ||
|
|
||
| - name: Build | ||
| run: dotnet build "ONODE/NextGenSoftware.OASIS.API.ONODE.Core.IntegrationTests/NextGenSoftware.OASIS.API.ONODE.Core.IntegrationTests.csproj" --no-restore | ||
|
|
||
| - name: Run integration tests | ||
| run: dotnet test "ONODE/NextGenSoftware.OASIS.API.ONODE.Core.IntegrationTests/NextGenSoftware.OASIS.API.ONODE.Core.IntegrationTests.csproj" --no-build --logger "trx;LogFileName=integration-results.trx" --results-directory TestResults | ||
|
|
||
| - name: Upload integration test results | ||
| uses: actions/upload-artifact@v4 | ||
| if: always() | ||
| with: | ||
| name: integration-test-results | ||
| path: TestResults/integration-results.trx | ||
|
|
||
| webapi-unit-tests: | ||
| name: ONODE WebAPI Unit Tests | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: ${{ env.DOTNET_VERSION }} | ||
|
|
||
| - name: Restore | ||
| run: dotnet restore "ONODE/NextGenSoftware.OASIS.API.ONODE.WebAPI.UnitTests/NextGenSoftware.OASIS.API.ONODE.WebAPI.UnitTests.csproj" | ||
|
|
||
| - name: Build | ||
| run: dotnet build "ONODE/NextGenSoftware.OASIS.API.ONODE.WebAPI.UnitTests/NextGenSoftware.OASIS.API.ONODE.WebAPI.UnitTests.csproj" --no-restore | ||
|
|
||
| - name: Run WebAPI unit tests | ||
| run: dotnet test "ONODE/NextGenSoftware.OASIS.API.ONODE.WebAPI.UnitTests/NextGenSoftware.OASIS.API.ONODE.WebAPI.UnitTests.csproj" --no-build --logger "trx;LogFileName=webapi-unit-results.trx" --results-directory TestResults | ||
|
|
||
| - name: Upload WebAPI unit test results | ||
| uses: actions/upload-artifact@v4 | ||
| if: always() | ||
| with: | ||
| name: webapi-unit-test-results | ||
| path: TestResults/webapi-unit-results.trx |


Uh oh!
There was an error while loading. Please reload this page.