From a4a63fe917cb19cafd277dcc3d71eb1b5fdf2723 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Tue, 6 Aug 2019 22:43:05 -0700 Subject: [PATCH] support for windows 1903 --- CHANGELOG.md | 4 ++++ yaml/compiler/clone.go | 4 +++- yaml/compiler/clone_test.go | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bfb772..d25c349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased +### Added +- Support for windows server 1903, by [@bradrydzewski](https://github.com/bradrydzewski). + ## [1.2.2] - 2019-07-29 ### Added - Ability to configure network_mode, by [@bradrydzewski](https://github.com/bradrydzewski). diff --git a/yaml/compiler/clone.go b/yaml/compiler/clone.go index 3f4feed..8b51c20 100644 --- a/yaml/compiler/clone.go +++ b/yaml/compiler/clone.go @@ -33,10 +33,12 @@ func cloneImage(src *yaml.Pipeline) string { return "drone/git:linux-arm" case src.Platform.OS == "linux" && src.Platform.Arch == "arm64": return "drone/git:linux-arm64" + case src.Platform.OS == "windows" && src.Platform.Version == "1903": + return "drone/git:windows-1903-amd64" case src.Platform.OS == "windows" && src.Platform.Version == "1809": return "drone/git:windows-1809-amd64" case src.Platform.OS == "windows" && src.Platform.Version == "1803": - return "drone/git:windows-1803" // TODO update to correct format + return "drone/git:windows-1803-amd64" case src.Platform.OS == "windows" && src.Platform.Version == "1709": return "drone/git:windows-1709-amd64" case src.Platform.OS == "windows": diff --git a/yaml/compiler/clone_test.go b/yaml/compiler/clone_test.go index 8a2cff6..4e72a16 100644 --- a/yaml/compiler/clone_test.go +++ b/yaml/compiler/clone_test.go @@ -36,6 +36,10 @@ func TestCloneImage(t *testing.T) { platform: yaml.Platform{OS: "windows", Arch: "amd64", Version: "1809"}, image: "drone/git:windows-1809-amd64", }, + { + platform: yaml.Platform{OS: "windows", Arch: "amd64", Version: "1903"}, + image: "drone/git:windows-1903-amd64", + }, { platform: yaml.Platform{OS: "windows", Arch: "amd64"}, image: "drone/git:windows-1809-amd64",