diff --git a/.github/workflows/Docker_build.yml b/.github/workflows/Docker_build.yml index ee4d480..479b475 100644 --- a/.github/workflows/Docker_build.yml +++ b/.github/workflows/Docker_build.yml @@ -49,12 +49,12 @@ jobs: .nuke/temp ~/.nuget/packages key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} - - name: dotnet nuget - run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }} + #- name: dotnet nuget + # run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }} - name: Run './build.cmd Docker' run: ./build.cmd Docker env: - CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }} + #CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }} Docker_Username: ${{ secrets.DOCKER_USERNAME }} Docker_Password: ${{ secrets.DOCKER_PASSWORD }} GITHUB_CONTEXT: ${{ toJSON(github) }} diff --git a/.github/workflows/pr_validation.yml b/.github/workflows/pr_validation.yml index a5ae796..79a28af 100644 --- a/.github/workflows/pr_validation.yml +++ b/.github/workflows/pr_validation.yml @@ -1,20 +1,6 @@ -# ------------------------------------------------------------------------------ -# -# -# This code was generated. -# -# - To turn off auto-generation set: -# -# [CustomGitHubActions (AutoGenerate = false)] -# -# - To trigger manual generation invoke: -# -# nuke --generate-configuration GitHubActions_pr_validation --host GitHubActions -# -# -# ------------------------------------------------------------------------------ - name: pr_validation +permissions: + secrets: read on: push: @@ -27,50 +13,29 @@ on: - dev jobs: - windows-latest: - name: windows-latest - runs-on: windows-latest + build: + name: Build on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] steps: - - uses: actions/checkout@v1 - - name: Make build.sh executable - run: chmod +x ./build.sh - - name: Make build.cmd executable - run: chmod +x ./build.cmd - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.* - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.* - - name: Cache .nuke/temp, ~/.nuget/packages - uses: actions/cache@v2 - with: - path: | - .nuke/temp - ~/.nuget/packages - key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} - - name: dotnet nuget - run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }} - - name: Run './build.cmd All' - run: ./build.cmd All - env: - CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }} - GITHUB_CONTEXT: ${{ toJSON(github) }} - ubuntu-latest: - name: ubuntu-latest - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Make build.sh executable - run: chmod +x ./build.sh - - name: Make build.cmd executable - run: chmod +x ./build.cmd - - uses: actions/setup-dotnet@v1 + - uses: actions/checkout@v3 + + - name: Make build scripts executable + if: runner.os != 'Windows' + run: | + chmod +x ./build.sh + chmod +x ./build.cmd + + - uses: actions/setup-dotnet@v2 with: dotnet-version: 5.0.* - - uses: actions/setup-dotnet@v1 + + - uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.* + - name: Cache .nuke/temp, ~/.nuget/packages uses: actions/cache@v2 with: @@ -78,10 +43,12 @@ jobs: .nuke/temp ~/.nuget/packages key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} - - name: dotnet nuget - run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }} + + #- name: dotnet nuget + # run: dotnet nuget add source -n Phobos "${{ secrets.CUSTOMNUGETSOURCE }}" + - name: Run './build.cmd All' run: ./build.cmd All env: - CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }} - GITHUB_CONTEXT: ${{ toJSON(github) }} + #CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }} + GITHUB_CONTEXT: ${{ toJSON(github) }} \ No newline at end of file diff --git a/k8s/local/services/local-services.yaml b/k8s/local/services/local-services.yaml index 373b29b..9c8a26f 100644 --- a/k8s/local/services/local-services.yaml +++ b/k8s/local/services/local-services.yaml @@ -25,6 +25,7 @@ metadata: labels: app: frontend spec: + publishNotReadyAddresses: true clusterIP: None ports: - port: 9228 diff --git a/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj b/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj index 3e8fad7..9bd9c1f 100644 --- a/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj +++ b/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs b/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs index 00b376e..cf51c8b 100644 --- a/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs +++ b/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs @@ -15,7 +15,6 @@ using Petabridge.Cmd.Cluster.Sharding; using Petabridge.Cmd.Host; using Petabridge.Cmd.Remote; -using Phobos.Hosting; namespace AkkaDotNet.Infrastructure.Configuration; @@ -175,10 +174,10 @@ public static AkkaConfigurationBuilder WithStressCluster(this AkkaConfigurationB .WithRemoting("0.0.0.0", options.AkkaClusterOptions.Port, options.AkkaClusterOptions.Hostname) .WithClustering(clusterOptions) .AddPersistence(options.PersistenceOptions) - .WithPhobos(AkkaRunMode.AkkaCluster, _ => - { - - }) + // .WithPhobos(AkkaRunMode.AkkaCluster, _ => + // { + // + // }) .StartActors((system, _) => { system.ActorOf(Props.Create(() => new DispatcherConfigLogger())); diff --git a/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs b/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs index 9499a84..4435eb3 100644 --- a/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs +++ b/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs @@ -39,7 +39,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi builder .SetResourceBuilder(resource) - .AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces + //.AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces .AddHttpClientInstrumentation() .AddAspNetCoreInstrumentation(options => { @@ -61,7 +61,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi builder .SetResourceBuilder(ResourceBuilder.CreateDefault() .AddService(Assembly.GetEntryAssembly()?.GetName().Name ?? "OpenTelemetryMetrics", serviceInstanceId: $"{Dns.GetHostName()}")) - .AddPhobosInstrumentation() + //.AddPhobosInstrumentation() .AddHttpClientInstrumentation() .AddAspNetCoreInstrumentation() .AddMeter(AkkaStressSource)