diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7bc7fbfd1..660290555 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -165,7 +165,6 @@ jobs: if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_PASSWORD }} run: | echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin - cp -v _build/repack/Release/netkan.exe _build/. ./build docker-inflator --exclusive upload-metadata-tester: @@ -187,7 +186,6 @@ jobs: if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_PASSWORD }} run: | echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin - cp -v _build/repack/Release/*kan.exe _build/. ./build docker-metadata --exclusive notify-discord: diff --git a/build.cake b/build.cake index 2eba791d1..c27053754 100644 --- a/build.cake +++ b/build.cake @@ -59,8 +59,7 @@ Task("docker-inflator") // Versions of Docker prior to 18.03.0-ce require the Dockerfile to be within the build context var dockerFile = inflatorDirectory.CombineWithFilePath("Dockerfile.netkan"); CreateDirectory(inflatorDirectory); - CopyFile(buildDirectory.CombineWithFilePath("netkan.exe"), - inflatorDirectory.CombineWithFilePath("netkan.exe")); + CopyFile(netkanFile, inflatorDirectory.CombineWithFilePath("netkan.exe")); CopyFile(rootDirectory.CombineWithFilePath("Dockerfile.netkan"), dockerFile); var mainTag = "kspckan/inflator"; @@ -109,10 +108,8 @@ Task("docker-metadata") // Versions of Docker prior to 18.03.0-ce require the Dockerfile to be within the build context var dockerFile = metadataDirectory.CombineWithFilePath("Dockerfile.metadata"); CreateDirectory(metadataDirectory); - CopyFile(buildDirectory.CombineWithFilePath("netkan.exe"), - metadataDirectory.CombineWithFilePath("netkan.exe")); - CopyFile(buildDirectory.CombineWithFilePath("ckan.exe"), - metadataDirectory.CombineWithFilePath("ckan.exe")); + CopyFile(netkanFile, metadataDirectory.CombineWithFilePath("netkan.exe")); + CopyFile(ckanFile, metadataDirectory.CombineWithFilePath("ckan.exe")); CopyFile(rootDirectory.CombineWithFilePath("Dockerfile.metadata"), dockerFile); var mainTag = "kspckan/metadata";