-
Notifications
You must be signed in to change notification settings - Fork 50
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
GEODE-9549: enable netcore tests in CI #867
Merged
pdxcodemonkey
merged 38 commits into
apache:develop
from
pdxcodemonkey:feature/GEODE-9549-enable-netcore-tests
Sep 22, 2021
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
364f525
GEODE-9549: Enable .net core tests in CI
pdxcodemonkey a648f6f
GEODE-9549: Change to serverless Concourse workers (I hope)
pdxcodemonkey 515cd14
GEODE-9549: gcloud didn't like distroless, maybe ubuntu will make it …
pdxcodemonkey c163877
GEODE-9549: I think 'slim' is a valid value for gcloud-sdk
pdxcodemonkey 284edcf
GEODE-9549: Well, that didn't work
pdxcodemonkey 757156b
GEODE-9549: Try pinned Alpine 3.13 image
pdxcodemonkey e2b33ba
GEODE-9549: Build NetCore and NetCore.Test projects individually
pdxcodemonkey 086297e
GEODE-9549: Attempt to fix up build order of netcore projects
pdxcodemonkey 312fae7
GEODE-9549: Change install source dir for NetCore
pdxcodemonkey 8d12919
GEODE-9549: Fix case of directory name in cmake install directive
pdxcodemonkey 974279f
GEODE-9549: Remove post-build steps in .net core projects
pdxcodemonkey e8ee708
GEODE-9549: Copy C bindings lib to binary dir for tests
pdxcodemonkey 2cb716a
GEODE-9549: Fix up a couple of cmake issues
pdxcodemonkey 31fde17
GEODE-9549: Add scripts project, and configure startserver.ps1
pdxcodemonkey 67cb1e9
GEODE-9549: configure remaining start/stop scripts
pdxcodemonkey f27effa
GEODE-9549: Specify individual projects in netcore CMakeLists.txt files
pdxcodemonkey ebab9f7
GEODE-9549: Use ctest to run netcore tests
pdxcodemonkey 5529b52
GEODE-9549: Enable ctest for session tests
pdxcodemonkey 6ebc993
GEODE-9549: remove netcore scripts directory
pdxcodemonkey 5c480d8
GEODE-9549: Make .net core project build in sequence
pdxcodemonkey 34f7ccf
GEODE-9549: Fix netcore test builds
pdxcodemonkey 80d5c79
GEODE-9549: Add license notification to cmake file
pdxcodemonkey 7e176f1
GEODE-9549: Fix source path for library install step
pdxcodemonkey f8c0392
GEODE-9549: Enable netcore and session tests using ctest
pdxcodemonkey 13acd38
Revert "GEODE-9549: Enable netcore and session tests using ctest"
pdxcodemonkey 2b712c3
GEODE9549: Add ctest for .net core tests
pdxcodemonkey 145976d
GEODE-9549: fix typo
pdxcodemonkey c375ea3
GEODE-9549: Need to be in the right binary dir to execute netcore tests
pdxcodemonkey 3532bcc
GEODE-9549: Fix up directories for netcore tests
pdxcodemonkey a005b97
GEODE-9549: Run tests in the build directory, not source
pdxcodemonkey 9cb596f
GEODE-9549: Specify config on dotnet test command line
pdxcodemonkey 7a2d3bf
GEODE-9549: Fix typo
pdxcodemonkey 651a5a9
GEODE-9549: Add tests back into CI
pdxcodemonkey 8f9a4de
GEODE-9549: Only scan netcore subdirectories if we're building .net core
pdxcodemonkey 577c387
GEODE-9549: rename netcore project dirs, remove mixed case names
pdxcodemonkey 3ee183a
Rename .net core project files to match new solution
pdxcodemonkey 7bdb884
GEODE-9549: Finish renaming of netcore projects
pdxcodemonkey 51c7cad
GEODE-9549: Fix up netcore directory names in CI
pdxcodemonkey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
GEODE-9549: Add scripts project, and configure startserver.ps1
- Windows scripts and tests work properly now
- Loading branch information
commit 31fde17d7591fb30503c4e91800febd84c44be4f
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,5 +15,8 @@ | |
project(netcore-session-integrationtest LANGUAGES NONE) | ||
|
||
if(DOTNET AND INCLUDE_DOTNET_CORE) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. My moving this out to the parent it avoids the issue of tests being added in this file for targets never built. |
||
add_custom_target(netcore-session-integrationtests ALL COMMAND ${DOTNET} build --configuration $<CONFIG> WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c VERBATIM) | ||
add_custom_target(netcore-session-integrationtests ALL | ||
COMMAND ${DOTNET} build --configuration $<CONFIG> | ||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c> ${CMAKE_CURRENT_SOURCE_DIR}/bin/x64/$<CONFIG>/netcoreapp3.1/ | ||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c VERBATIM) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
project(netcore-scripts LANGUAGES NONE) | ||
|
||
if(DOTNET AND INCLUDE_DOTNET_CORE) | ||
set(GEODE_NATIVE_NETCORE_UTILITY_CLASSPATH ${CMAKE_CURRENT_BINARY_DIR}/../utility/netcore-utility.jar) | ||
file(TO_NATIVE_PATH ${GEODE_NATIVE_NETCORE_UTILITY_CLASSPATH} GEODE_NATIVE_NETCORE_UTILITY_CLASSPATH) | ||
message(STATUS "CLASSPATH: ${GEODE_NATIVE_NETCORE_UTILITY_CLASSPATH}") | ||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startserver.ps1.in ${CMAKE_CURRENT_BINARY_DIR}/startserver.ps1) | ||
endif() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should probably .NET Core check around the
add_subdirectory
calls. This prevents them from even being processed on when not enabled.