Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into feature/neural_l…
Browse files Browse the repository at this point in the history
…ayer_test_redundancies
  • Loading branch information
saatvikshah committed Dec 6, 2018
2 parents 85b2acc + 378a9d4 commit d2e478e
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 4 deletions.
27 changes: 27 additions & 0 deletions .ci/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
jobs:
- job: lint
displayName: Check code formatting
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
pool:
vmImage: ubuntu-16.04

variables:
testRunTitle: '$(build.sourceBranchName)-debian'
testRunPlatform: debian
imageName: 'shogun/shogun-dev'

steps:
- checkout: self
clean: true
fetchDepth: 5
submodules: true

- task: docker@0
displayName: Lint
inputs:
action: 'Run an image'
imageName: $(imageName)
volumes: |
$(build.sourcesDirectory):/src
workDir: '/src'
containerCommand: './scripts/check_format.sh $(System.PullRequest.SourceBranch) $(System.PullRequest.TargetBranch)'

- job: libshogun
displayName: Linux libshogun CI Tests

Expand Down
13 changes: 12 additions & 1 deletion .ci/download-extract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:
specificBuildWithTriggering: false

steps:
- ${{ if eq(parameters.specificBuildWithTriggering, 'true') }}:
- ${{ if and(eq(parameters.specificBuildWithTriggering, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
- task: DownloadBuildArtifacts@0
displayName: ${{ format('Download {0} archive', parameters.name) }}
continueOnError: true
Expand All @@ -20,6 +20,17 @@ steps:
artifactName: ${{ parameters.artifactName }}
downloadPath: ${{ parameters.downloadPath }}

- ${{ if and(eq(parameters.specificBuildWithTriggering, 'true'), eq(variables['Build.Reason'], 'PullRequest')) }}:
- task: DownloadBuildArtifacts@0
displayName: ${{ format('Download {0} archive', parameters.name) }}
continueOnError: true
inputs:
buildType: 'specific'
project: $(System.TeamProjectId)
pipeline: $(System.DefinitionId)
buildVersionToDownload: "latest"
artifactName: ${{ parameters.artifactName }}
downloadPath: ${{ parameters.downloadPath }}

- ${{ if ne(parameters.specificBuildWithTriggering, 'true') }}:
- task: DownloadBuildArtifacts@0
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions cmake/external/variant.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ExternalProject_Add(
PREFIX ${CMAKE_BINARY_DIR}/variant
SOURCE_DIR ${VARIANT_SOURCE_DIR}
GIT_REPOSITORY https://github.com/mpark/variant.git
GIT_TAG 37c7b8c163c482358afa7daf4c6ee74fe55a6d91
GIT_TAG caaff9a8cb00b7897ee581e2916e78a6bb916b20
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VARIANT_SOURCE_DIR}/${VARIANT_RELEASE_VERSION}/variant.hpp ${VARIANT_INCLUDE_DIR}/variant.hpp
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${VARIANT_SOURCE_DIR}/include/mpark ${VARIANT_INCLUDE_DIR}
)

add_dependencies(libshogun variant)

0 comments on commit d2e478e

Please sign in to comment.