Skip to content
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.

Sign up for GitHub

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

[chore] add more Windows versions for testing #37025

Merged
merged 6 commits into from
Jan 9, 2025
+32 −4
Merged

[chore] add more Windows versions for testing #37025

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c855d73
[chore] add more Windows versions for testing
CodePrometheus Jan 5, 2025
9d2111a
[fix] adjust version and try to fix ci
CodePrometheus Jan 8, 2025
909d90e
Merge branch 'main' into add-more-archs-for-windows
CodePrometheus Jan 8, 2025
2ca8aa6
[fix] change assert to require
CodePrometheus Jan 8, 2025
094749e
Merge remote-tracking branch 'upstream/main' into add-more-archs-for-…
CodePrometheus Jan 9, 2025
6e3438d
[fix] skip Test_PushMetricsConcurrent when win25 and merge upstream/main
CodePrometheus Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2025]
os: [windows-latest]
runs-on: ${{ matrix.os }}
needs: [windows-file-changed]
if: ${{ github.actor != 'dependabot[bot]' && ((contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') || needs.windows-file-changed.outputs.changed == 'true') }}
Expand Down
3 changes: 2 additions & 1 deletion exporter/prometheusremotewriteexporter/exporter_concurrency_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,9 @@ func Test_PushMetricsConcurrent(t *testing.T) {

// Ensure that the test server is up before making the requests
assert.EventuallyWithT(t, func(c *assert.CollectT) {
_, checkRequestErr := http.Get(server.URL)
resp, checkRequestErr := http.Get(server.URL)
assert.NoError(c, checkRequestErr)
assert.NoError(c, resp.Body.Close())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏼

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to avoid crash in case of error, change line 134 to require instead of assert.

}, 5*time.Second, 100*time.Millisecond)

var wg sync.WaitGroup
Expand Down