Skip to content

Commit

Permalink
Skip format on Windows due to flakiness
Browse files Browse the repository at this point in the history
  • Loading branch information
stevejgordon committed Dec 5, 2024
1 parent b47e2a1 commit ed72b84
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 18 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
runs-on: ubuntu-latest
needs: [ 'format' ]
timeout-minutes: 30

steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
Expand Down
29 changes: 13 additions & 16 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,19 @@ env:

jobs:

format:
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
uses: ./.github/workflows/bootstrap
- name: Format
run: ./build.bat format
# format:
# runs-on: windows-2022
# steps:
# - uses: actions/checkout@v4
# - name: Bootstrap Action Workspace
# uses: ./.github/workflows/bootstrap
# - name: Format
# run: ./build.bat format

#required step
tests:
runs-on: windows-2022
needs: [ 'format' ]
timeout-minutes: 30

steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
Expand All @@ -61,9 +59,9 @@ jobs:
- name: 'Tests: Unit'
run: ./build.bat test --test-suite unit

integrations-tests:
integration-tests:
runs-on: windows-2022
needs: [ 'format', 'tests' ]
needs: [ 'tests' ]
steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
Expand All @@ -84,7 +82,7 @@ jobs:
startup-hook-tests:
runs-on: windows-2022
needs: [ 'format', 'tests' ]
needs: [ 'tests' ]
steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
Expand All @@ -95,7 +93,7 @@ jobs:

profiler-tests:
runs-on: windows-2022
needs: [ 'format', 'tests' ]
needs: [ 'tests' ]
steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
Expand All @@ -109,8 +107,7 @@ jobs:

test-iis:
runs-on: windows-latest
needs: [ 'format', 'tests' ]

needs: [ 'tests' ]
steps:
- uses: actions/checkout@v4
- name: Bootstrap Action Workspace
Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Apm/Report/PayloadSenderV2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ private void ProcessQueueItems(object[] queueItems)
if (_logger.IsEnabled(LogLevel.Trace))


stream.Position = 0;
stream.Position = 0;
using (var content = new StreamContent(stream))
{
content.Headers.ContentType = MediaTypeHeaderValue;
Expand Down

0 comments on commit ed72b84

Please sign in to comment.