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.

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

m1 build fixes #7720

Merged
merged 1 commit into from
Nov 8, 2021
Merged

m1 build fixes #7720

merged 1 commit into from
Nov 8, 2021

Conversation

jrhizor
Copy link
Contributor

@jrhizor jrhizor commented Nov 8, 2021

No description provided.

@@ -38,15 +38,18 @@ void testFromIterator() throws Exception {

@Test
void testFromStream() throws Exception {
final Stream<String> stream = spy(Stream.of("a", "b", "c"));
final AtomicBoolean isClosed = new AtomicBoolean(false);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can't spy a Stream when iterator() is called because it is a public final method in Java 17.

This checks the same thing, but in a more future-compatible way.

@@ -41,7 +41,7 @@ services:
build:
dockerfile: Dockerfile
args:
ARCH: ${DOCKER_BUILD_ARCH}
DOCKER_BUILD_ARCH: ${DOCKER_BUILD_ARCH}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This didn't align with the env variables declared.

@jrhizor jrhizor temporarily deployed to more-secrets November 8, 2021 04:59 Inactive
@jrhizor jrhizor merged commit 4a5751a into master Nov 8, 2021
@jrhizor jrhizor deleted the jrhizor/m1-fixes branch November 8, 2021 07:00
schlattk pushed a commit to schlattk/airbyte that referenced this pull request Jan 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants