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

Test Windows in CI #6824

Merged
merged 16 commits into from
Nov 1, 2024
Merged

Test Windows in CI #6824

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b075cd3
Test Windows in CI
trask Oct 26, 2024
db39d74
try
trask Oct 26, 2024
c3a99f8
try
trask Oct 26, 2024
55fc6f9
try
trask Oct 26, 2024
be47bd5
fixes
trask Oct 26, 2024
02d077f
fixes
trask Oct 26, 2024
2fb021a
fix
trask Oct 26, 2024
a249411
close
trask Oct 26, 2024
2f569a9
await
trask Oct 26, 2024
a88ebde
fix
trask Oct 26, 2024
4ae48db
spotless
trask Oct 26, 2024
c6d6c5f
fix
trask Oct 26, 2024
da3ff53
bypass
trask Oct 26, 2024
c1a6622
Merge remote-tracking branch 'upstream/main' into windows
trask Oct 30, 2024
8f1b191
comment
trask Oct 30, 2024
67e05c0
comment
trask Oct 30, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
test-java-version:
- 8
- 11
Expand Down Expand Up @@ -68,7 +69,8 @@ jobs:
./gradlew build
${{ matrix.coverage && 'jacocoTestReport' || '' }}
-PtestJavaVersion=${{ matrix.test-java-version }}
-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
"-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
"-Porg.gradle.java.installations.auto-download=false"
Comment on lines -74 to +76
Copy link
Member Author

Choose a reason for hiding this comment

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

I think the double quotes ended up being the only thing that was needed here, but the other changes seem good and align with the opentelemetry-java-instrumentation project (where, btw, we only run smoke tests against windows but not regular integration or unit tests, so haven't run into this double quote issue)

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
# JMH-based tests run only if this environment variable is set to true
Expand Down
3 changes: 2 additions & 1 deletion ...ava/io/opentelemetry/exporter/prometheus/internal/PrometheusMetricReaderProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ void createMetricReader_WithConfiguration() throws IOException {
.extracting("server", as(InstanceOfAssertFactories.type(HttpServer.class)))
.satisfies(
server -> {
assertThat(server.getAddress().getHostName()).isEqualTo("localhost");
assertThat(server.getAddress().getHostName())
.isIn("localhost", "kubernetes.docker.internal");
assertThat(server.getAddress().getPort()).isEqualTo(port);
});
assertThat(metricReader.getMemoryMode()).isEqualTo(MemoryMode.IMMUTABLE_DATA);
Expand Down
Loading