From 0078bfd7a979f581be71bdf4199ee65c22a532e8 Mon Sep 17 00:00:00 2001 From: William Armiros Date: Tue, 1 Sep 2020 16:32:43 -0700 Subject: [PATCH] removed windows from github actions because agent building doesn't work on windows --- .github/workflows/continuous_build.yml | 1 - aws-xray-agent-plugin/build.gradle.kts | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous_build.yml b/.github/workflows/continuous_build.yml index cad0e5d..dd0bd90 100644 --- a/.github/workflows/continuous_build.yml +++ b/.github/workflows/continuous_build.yml @@ -10,7 +10,6 @@ jobs: os: - macos-latest - ubuntu-latest - - windows-latest java: - 8 - 11 diff --git a/aws-xray-agent-plugin/build.gradle.kts b/aws-xray-agent-plugin/build.gradle.kts index de9debc..2da9ca9 100644 --- a/aws-xray-agent-plugin/build.gradle.kts +++ b/aws-xray-agent-plugin/build.gradle.kts @@ -147,13 +147,8 @@ tasks { } // Integration tests run on Windows and Unix in GitHub actions - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - jvmArgs("-javaagent:$buildDir\\libs\\disco\\disco-java-agent.jar=pluginPath=$buildDir\\libs\\disco\\disco-plugins", - "-Dcom.amazonaws.xray.strategy.tracingName=IntegTest") - } else { - jvmArgs("-javaagent:$buildDir/libs/disco/disco-java-agent.jar=pluginPath=$buildDir/libs/disco/disco-plugins", - "-Dcom.amazonaws.xray.strategy.tracingName=IntegTest") - } + jvmArgs("-javaagent:$buildDir/libs/disco/disco-java-agent.jar=pluginPath=$buildDir/libs/disco/disco-plugins", + "-Dcom.amazonaws.xray.strategy.tracingName=IntegTest") // Cannot run tests until agent and all plugins are available dependsOn(withType())