Merge pull request #38 from drone/update_git_version

Update git version to 2.30.2 to fix git clone vulnerability

.drone.starlark

@@ -0,0 +1,130 @@
+# this starlark script should be used to generate the .drone.yml
+# configuration file.
+
+def main(ctx):
+  # TODO consider running unit tests before building and
+  # publishing docker images.
+  before = {}
+
+  stages = [
+    linux('arm'),
+    linux('arm64'),
+    linux('amd64'),
+    windows('1903'),
+    windows('1809'),
+  ]
+
+  after = manifest()
+
+  # the after stage should only execute after all previous
+  # stages complete. this builds the dependency graph.
+  for stage in stages:
+    after['depends_on'].append(stage['name'])
+
+  return stages + [ after ]
+
+# create a pipeline stage responsible for building and
+# publishing the Docker image on linux.
+def linux(arch):
+  return {
+    'kind': 'pipeline',
+    'type': 'docker',
+    'name': 'linux-%s' % arch,
+    'platform': {
+      'os': 'linux',
+      'arch': arch,
+    },
+    'steps': [
+      {
+        'name': 'build',
+        'image': 'golang:1.10',
+        'commands': [
+          'cd posix',
+          'tar -xf fixtures.tar -C /',
+          'go test -v',
+        ],
+      },
+      {
+        'name': 'publish',
+        'image': 'plugins/docker',
+        'settings': {
+          'auto_tag': 'true',
+          'auto_tag_suffix': 'linux-%s' % arch,
+          'dockerfile': 'docker/Dockerfile.linux.%s' % arch,
+          'password': { 
+            'from_secret': 'docker_password',
+          },
+          'repo': 'drone/git',
+          'username': 'drone',
+        },
+        'when': {
+          'event': ['push', 'tag']
+        }
+      }
+    ]
+  }
+
+# create a pipeline stage responsible for building and
+# publishing the Docker image on windows. The windows stage
+# uses an ssh runner, as opposed to a docker runner.
+def windows(version):
+  return {
+    'kind': 'pipeline',
+    'type': 'ssh',
+    'name': 'windows-%s-amd64' % version,
+    'platform': {
+      'os': 'windows'
+    },
+    'server': {
+      'host':     { 'from_secret': 'windows_server_%s' % version },
+      'user':     { 'from_secret': 'windows_username' },
+      'password': { 'from_secret': 'windows_password' },
+    },
+    'steps': [
+      {
+        'name': 'build',
+        'environment': {
+          'USERNAME': { 'from_secret': 'docker_username' },
+          'PASSWORD': { 'from_secret': 'docker_password' },
+        },
+        # TODO these commands build and publish the latest
+        # docker tag regardless of git tag.
+        'commands': [
+          'docker login -u $env:USERNAME -p $env:PASSWORD',
+          'docker build -f docker/Dockerfile.windows.%s -t drone/git:windows-%s-amd64 .' % (version, version),
+          'docker push drone/git:windows-%s-amd64' % version,
+        ],
+      },
+    ],
+    'trigger': {
+      'event': ['push']
+    }
+  }
+
+# create a pipeline stage responsible for creating and
+# publishing a docker manifest to the registry.
+def manifest():
+  return {
+    'kind': 'pipeline',
+    'type': 'docker',
+    'name': 'manifest',
+    'steps': [
+      {
+        'name': 'manifest',
+        'image': 'plugins/manifest',
+        'settings': {
+          'auto_tag': 'true',
+          'username': 'drone',
+          'password': {
+            'from_secret': 'docker_password'
+          },
+          'spec': 'docker/manifest.tmpl',
+          'ignore_missing': 'true',
+        },
+      },
+    ],
+    'depends_on': [],
+    'trigger': {
+      'event': ['push', 'tag']
+    }
+  }

.drone.yml

@@ -1,29 +1,33 @@
 ---
+# this file is automatically generated. DO NOT EDIT
+
 kind: pipeline
+type: docker
 name: linux-amd64
 
 platform:
-  os: linux
   arch: amd64
+  os: linux
 
 steps:
-- name: test
+- name: build
   image: golang:1.10
   commands:
   - cd posix
   - tar -xf fixtures.tar -C /
   - go test -v
 
-- name: push
+- name: publish
-  image: plugins/docker
+  image: plugins/docker:18
   settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
     dockerfile: docker/Dockerfile.linux.amd64
-    password:
-      $secret: password
     repo: drone/git
-    username: drone
+    auto_tag: "true"
+    auto_tag_suffix: linux-amd64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
   when:
     event:
     - push
@@ -31,30 +35,32 @@ steps:
 
 ---
 kind: pipeline
+type: docker
 name: linux-arm64
 
 platform:
-  os: linux
   arch: arm64
+  os: linux
 
 steps:
-- name: test
+- name: build
   image: golang:1.10
   commands:
   - cd posix
   - tar -xf fixtures.tar -C /
   - go test -v
 
-- name: push
+- name: publish
-  image: plugins/docker:linux-arm64
+  image: plugins/docker:18
   settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
     dockerfile: docker/Dockerfile.linux.arm64
-    password:
-      $secret: password
     repo: drone/git
-    username: drone
+    auto_tag: "true"
+    auto_tag_suffix: linux-arm64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
   when:
     event:
     - push
@@ -62,30 +68,32 @@ steps:
 
 ---
 kind: pipeline
+type: docker
 name: linux-arm
 
 platform:
-  os: linux
   arch: arm
+  os: linux
 
 steps:
-- name: test
+- name: build
   image: golang:1.10
   commands:
   - cd posix
   - tar -xf fixtures.tar -C /
   - go test -v
 
-- name: push
+- name: publish
-  image: plugins/docker:linux-arm
+  image: plugins/docker:18
   settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
     dockerfile: docker/Dockerfile.linux.arm
-    password:
-      $secret: password
     repo: drone/git
-    username: drone
+    auto_tag: "true"
+    auto_tag_suffix: linux-arm
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
   when:
     event:
     - push
@@ -93,37 +101,126 @@ steps:
 
 ---
 kind: pipeline
-name: after
+type: ssh
+name: windows-1909-amd64
 
 platform:
-  os: linux
+  os: windows
-  arch: amd64
+
+server:
+  host:
+    from_secret: windows_server_1909
+  password:
+    from_secret: windows_password
+  user:
+    from_secret: windows_username
+
+steps:
+- name: build
+  commands:
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - docker build -f docker/Dockerfile.windows.1909 -t drone/git:windows-1909-amd64 .
+  - docker push drone/git:windows-1909-amd64
+  environment:
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
+
+trigger:
+  event:
+  - push
+
+---
+kind: pipeline
+type: ssh
+name: windows-1903-amd64
+
+platform:
+  os: windows
+
+server:
+  host:
+    from_secret: windows_server_1903
+  password:
+    from_secret: windows_password
+  user:
+    from_secret: windows_username
+
+steps:
+- name: build
+  commands:
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - docker build -f docker/Dockerfile.windows.1903 -t drone/git:windows-1903-amd64 .
+  - docker push drone/git:windows-1903-amd64
+  environment:
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
+
+trigger:
+  event:
+  - push
+
+---
+kind: pipeline
+type: ssh
+name: windows-1809-amd64
+
+platform:
+  os: windows
+
+server:
+  host:
+    from_secret: windows_server_1809
+  password:
+    from_secret: windows_password
+  user:
+    from_secret: windows_username
+
+steps:
+- name: build
+  commands:
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - docker build -f docker/Dockerfile.windows.1809 -t drone/git:windows-1809-amd64 .
+  - docker push drone/git:windows-1809-amd64
+  environment:
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
+
+trigger:
+  event:
+  - push
+
+---
+kind: pipeline
+type: docker
+name: manifest
 
 steps:
 - name: manifest
-  image: plugins/manifest:1
+  image: plugins/manifest
   settings:
-    ignore_missing: true
+    auto_tag: "true"
-    password:
+    ignore_missing: "true"
-      $secret: password
     spec: docker/manifest.tmpl
-    username: drone
+    username:
-  when:
+      from_secret: docker_username
-    branch:
+    password:
-    - master
+      from_secret: docker_password
-    event:
+
-    - push
+trigger:
+  event:
+  - push
+  - tag
 
 depends_on:
-- linux-arm
-- linux-arm64
 - linux-amd64
-
+- linux-arm64
----
+- linux-arm
-kind: secret
+- windows-1909-amd64
-type: external
+- windows-1903-amd64
-data:
+- windows-1809-amd64
-  password: "drone/docker#password"
-  username: "drone/docker#username"
-
-...

.gitignore

@@ -1,2 +0,0 @@
-.drone.jsonnet
-.drone.jsonnet.yml

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+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
+
+## [1.1.0]
+### Added
+
+- Ability to clone tags for promotion events from [@josmo](https://github.com/josme)
+- Support for git lfs in base images from [@carlwgeorge](https://github.com/carlwgeorge)
+- Support for windows 1803 from [@donny-dont](https://github.com/donny-dont)
+- Support for windows 1809 from [@donny-dont](https://github.com/donny-dont)
+
+### Fixed
+
+- Fixed error merging when missing email from [@bradrydzewski](https://github.com/bradrydzewski)
+- Fixed empty ref on windows from [@drpebcak](https://github.com/drpebcak)

README.md

@@ -0,0 +1,24 @@
+# drone-git
+
+Drone plugin to clone `git` repositories.
+
+## Build
+
+Build the Docker image with the following commands:
+
+```
+docker build --rm -f docker/Dockerfile.linux.amd64 -t drone/git .
+```
+
+## Usage
+
+Clone a commit:
+
+```
+docker run --rm \
+  -e DRONE_REMOTE_URL=https://github.com/drone/envsubst.git \
+  -e DRONE_BUILD_EVENT=push \
+  -e DRONE_COMMIT_SHA=15e3f9b7e16332eee3bbdff9ef31f95d23c5da2c \
+  -e DRONE_COMMIT_BRANCH=master \
+  drone/git
+```

docker/Dockerfile.linux.amd64

@@ -1,5 +1,5 @@
-FROM alpine:3.6
+FROM alpine:3.13
-RUN apk add --no-cache ca-certificates git openssh curl perl
+RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli
 
 ADD posix/* /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/clone"]

docker/Dockerfile.linux.arm

@@ -1,5 +1,5 @@
-FROM arm32v6/alpine:3.6
+FROM arm32v6/alpine:3.13
-RUN apk add --no-cache ca-certificates git openssh curl perl
+RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl
 
 ADD posix/* /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/clone"]

docker/Dockerfile.linux.arm6

@@ -1,5 +1,5 @@
-FROM arm32v6/alpine:3.6
+FROM arm32v6/alpine:3.13
-RUN apk add --no-cache ca-certificates git openssh curl perl
+RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl
 
 ADD posix/* /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/clone"]

docker/Dockerfile.linux.arm64

@@ -1,5 +1,5 @@
-FROM arm64v8/alpine:3.6
+FROM arm64v8/alpine:3.13
-RUN apk add --no-cache ca-certificates git openssh curl perl
+RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl
 
 ADD posix/* /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/clone"]

docker/Dockerfile.linux.arm7

@@ -1,5 +1,5 @@
-FROM arm32v6/alpine:3.6
+FROM arm32v6/alpine:3.13
-RUN apk add --no-cache ca-certificates git openssh curl perl
+RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl
 
 ADD posix/* /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/clone"]

docker/Dockerfile.linux.arm8

@@ -1,5 +1,5 @@
-FROM arm64v8/alpine:3.6
+FROM arm64v8/alpine:3.13
-RUN apk add --no-cache ca-certificates git openssh curl perl
+RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl
 
 ADD posix/* /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/clone"]

docker/Dockerfile.windows.1803

@@ -1,11 +1,13 @@
-FROM microsoft/windowsservercore:1803 AS git
+# escape=`
+
+FROM mcr.microsoft.com/windows/servercore:1803 AS git
 SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
-    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.19.0-rc2.windows.1/MinGit-2.19.0.rc2.windows.1-64-bit.zip -OutFile git.zip; \
+    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; `
-    Expand-Archive git.zip -DestinationPath C:\git
+    Expand-Archive git.zip -DestinationPath C:\git;
 
-FROM microsoft/powershell:nanoserver-1803 
+FROM mcr.microsoft.com/powershell:nanoserver-1803 
 COPY --from=git /git /git
 
 ADD windows/* /bin/
@@ -14,7 +16,5 @@ ADD windows/* /bin/
 USER ContainerAdministrator
 RUN setx /M PATH "%PATH%;C:\Program Files\PowerShell"
 
-ENV HOME C:\\Users\\ContainerAdministrator
-
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 CMD [ "pwsh", "C:\\bin\\clone.ps1" ]

docker/Dockerfile.windows.1809

@@ -1,11 +1,13 @@
-FROM microsoft/windowsservercore:1709 AS git
+# escape=`
+
+FROM mcr.microsoft.com/windows/servercore:1809 AS git
 SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
-    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.19.0-rc2.windows.1/MinGit-2.19.0.rc2.windows.1-64-bit.zip -OutFile git.zip; \
+    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; `
-    Expand-Archive git.zip -DestinationPath C:\git
+    Expand-Archive git.zip -DestinationPath C:\git;
 
-FROM microsoft/powershell:nanoserver-1709 
+FROM mcr.microsoft.com/powershell:nanoserver-1809
 COPY --from=git /git /git
 
 ADD windows/* /bin/
@@ -14,7 +16,5 @@ ADD windows/* /bin/
 USER ContainerAdministrator
 RUN setx /M PATH "%PATH%;C:\Program Files\PowerShell"
 
-ENV HOME C:\\Users\\ContainerAdministrator
-
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 CMD [ "pwsh", "C:\\bin\\clone.ps1" ]

docker/Dockerfile.windows.1903

@@ -0,0 +1,20 @@
+# escape=`
+
+FROM mcr.microsoft.com/windows/servercore:1903 AS git
+SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
+    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; `
+    Expand-Archive git.zip -DestinationPath C:\git;
+
+FROM mcr.microsoft.com/powershell:nanoserver-1903
+COPY --from=git /git /git
+
+ADD windows/* /bin/
+
+# https://github.com/PowerShell/PowerShell/issues/6211#issuecomment-367477137
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\PowerShell"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+CMD [ "pwsh", "C:\\bin\\clone.ps1" ]

docker/Dockerfile.windows.1909

@@ -0,0 +1,20 @@
+# escape=`
+
+FROM mcr.microsoft.com/windows/servercore:1909 AS git
+SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
+    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; `
+    Expand-Archive git.zip -DestinationPath C:\git;
+
+FROM mcr.microsoft.com/powershell:nanoserver-1909
+COPY --from=git /git /git
+
+ADD windows/* /bin/
+
+# https://github.com/PowerShell/PowerShell/issues/6211#issuecomment-367477137
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\PowerShell"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+CMD [ "pwsh", "C:\\bin\\clone.ps1" ]

docker/manifest.tmpl

@@ -1,31 +1,55 @@
-image: drone/git:latest
+image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
 manifests:
   -
-    image: drone/git:linux-amd64
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: drone/git:linux-arm64
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:
       variant: v8
       architecture: arm64
       os: linux
   -
-    image: drone/git:linux-arm
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v7
       architecture: arm
       os: linux
   -
-    image: drone/git:linux-arm
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v6
       architecture: arm
       os: linux
   -
-    image: drone/git:windows-1803
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64
     platform:
-      architecture: arm
+      architecture: amd64
-      os: linux
+      os: windows
-      os.version: 10.0.17134.165
+      version: 1803
+  -
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
+    platform:
+      architecture: amd64
+      os: windows
+      version: 1809
+  -
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64
+    platform:
+      architecture: amd64
+      os: windows
+      version: 1903
+  -
+    image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64
+    platform:
+      architecture: amd64
+      os: windows
+      version: 1909

posix/clone

@@ -19,9 +19,9 @@ fi
 # the ssh key and add the netrc machine to the
 # known hosts file.
 
-if [[ ! -z "${SSH_KEY}" ]]; then
+if [[ ! -z "${DRONE_SSH_KEY}" ]]; then
 	mkdir /root/.ssh
-	echo -n "$SSH_KEY" > /root/.ssh/id_rsa
+	echo -n "$DRONE_SSH_KEY" > /root/.ssh/id_rsa
 	chmod 600 /root/.ssh/id_rsa
 
 	touch /root/.ssh/known_hosts
@@ -29,21 +29,48 @@ if [[ ! -z "${SSH_KEY}" ]]; then
 	ssh-keyscan -H ${DRONE_NETRC_MACHINE} > /etc/ssh/ssh_known_hosts 2> /dev/null
 fi
 
+# AWS codecommit support using AWS access key & secret key
+# Refer: https://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-https-unixes.html
+
+if [[ ! -z "$DRONE_AWS_ACCESS_KEY" ]]; then
+	aws configure set aws_access_key_id $DRONE_AWS_ACCESS_KEY
+	aws configure set aws_secret_access_key $DRONE_AWS_SECRET_KEY
+	aws configure set default.region $DRONE_AWS_REGION
+
+	git config --global credential.helper '!aws codecommit credential-helper $@'
+	git config --global credential.UseHttpPath true
+fi
+
 # configure git global behavior and parameters via the
 # following environment variables:
 
-export GIT_AUTHOR_NAME=${DRONE_COMMIT_AUTHOR_NAME=drone}
-export GIT_AUTHOR_EMAIL=${DRONE_COMMIT_AUTHOR_EMAIL=drone@localhost}
-export GIT_COMMITTER_NAME=${GIT_AUTHOR_NAME}
-export GIT_COMMITTER_EMAIL=${GIT_AUTHOR_EMAIL}
-# GIT_SSL_NO_VERIFY=
 
+if [[ -z "${DRONE_COMMIT_AUTHOR_NAME}" ]]; then
+	export DRONE_COMMIT_AUTHOR_NAME=drone
+fi
+
+if [[ -z "${DRONE_COMMIT_AUTHOR_EMAIL}" ]]; then
+	export DRONE_COMMIT_AUTHOR_EMAIL=drone@localhost
+fi
+
+export GIT_AUTHOR_NAME=${DRONE_COMMIT_AUTHOR_NAME}
+export GIT_AUTHOR_EMAIL=${DRONE_COMMIT_AUTHOR_EMAIL}
+export GIT_COMMITTER_NAME=${DRONE_COMMIT_AUTHOR_NAME}
+export GIT_COMMITTER_EMAIL=${DRONE_COMMIT_AUTHOR_EMAIL}
 
 # invoke the sub-script based on the drone event type.
 # TODO we should ultimately look at the ref, since
 # we need something compatible with deployment events.
 
-case $DRONE_BUILD_EVENT in
+CLONE_TYPE=$DRONE_BUILD_EVENT
+case $DRONE_COMMIT_REF in
+  refs/tags/* ) CLONE_TYPE=tag ;;
+  refs/pull/* ) CLONE_TYPE=pull_request ;;
+  refs/pull-request/* ) CLONE_TYPE=pull_request ;;
+  refs/merge-requests/* ) CLONE_TYPE=pull_request ;;
+esac
+
+case $CLONE_TYPE in
 pull_request)
 	clone-pull-request
 	;;

posix/clone-commit

@@ -10,6 +10,30 @@ if [ ! -d .git ]; then
 	git remote add origin ${DRONE_REMOTE_URL}
 fi
 
+# the branch may be empty for certain event types,
+# such as github deployment events. If the branch
+# is empty we checkout the sha directly. Note that
+# we intentially omit depth flags to avoid failed
+# clones due to lack of history.
+if [[ -z "${DRONE_COMMIT_BRANCH}" ]]; then
+	set -e
+	set -x
+	git fetch origin
+	git checkout -qf ${DRONE_COMMIT_SHA}
+	exit 0
+fi
+
+# the commit sha may be empty for builds that are
+# manually triggered in Harness CI Enterprise. If
+# the commit is empty we clone the branch.
+if [[ -z "${DRONE_COMMIT_SHA}" ]]; then
+	set -e
+	set -x
+	git fetch ${FLAGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:
+	git checkout -b ${DRONE_COMMIT_BRANCH} origin/${DRONE_COMMIT_BRANCH}
+	exit 0
+fi
+
 set -e
 set -x
 

posix/clone-pull-request

@@ -17,4 +17,4 @@ git fetch ${FLAGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:
 git checkout ${DRONE_COMMIT_BRANCH}
 
 git fetch origin ${DRONE_COMMIT_REF}:
-git rebase ${DRONE_COMMIT_SHA}
+git merge ${DRONE_COMMIT_SHA}

posix/posix.go

@@ -1 +1,3 @@
 package posix
+
+//go:generate go run ../scripts/includetext.go --input=clone --input=clone-commit --input=clone-pull-request --input=clone-tag --package=posix --output=posix_gen.go

posix/posix_gen.go

@@ -0,0 +1,138 @@
+package posix
+
+// DO NOT EDIT. This file is automatically generated.
+
+// Contents of clone
+const Clone = `#!/bin/sh
+
+if [[ ! -z "${DRONE_WORKSPACE}" ]]; then
+	cd ${DRONE_WORKSPACE}
+fi
+
+# if the netrc enviornment variables exist, write
+# the netrc file.
+
+if [[ ! -z "${DRONE_NETRC_MACHINE}" ]]; then
+	cat <<EOF > /root/.netrc
+machine ${DRONE_NETRC_MACHINE}
+login ${DRONE_NETRC_USERNAME}
+password ${DRONE_NETRC_PASSWORD}
+EOF
+fi
+
+# if the ssh_key environment variable exists, write
+# the ssh key and add the netrc machine to the
+# known hosts file.
+
+if [[ ! -z "${SSH_KEY}" ]]; then
+	mkdir /root/.ssh
+	echo -n "$SSH_KEY" > /root/.ssh/id_rsa
+	chmod 600 /root/.ssh/id_rsa
+
+	touch /root/.ssh/known_hosts
+	chmod 600 /root/.ssh/known_hosts
+	ssh-keyscan -H ${DRONE_NETRC_MACHINE} > /etc/ssh/ssh_known_hosts 2> /dev/null
+fi
+
+# configure git global behavior and parameters via the
+# following environment variables:
+
+
+if [[ -z "${DRONE_COMMIT_AUTHOR_NAME}" ]]; then
+	export DRONE_COMMIT_AUTHOR_NAME=drone
+fi
+
+if [[ -z "${DRONE_COMMIT_AUTHOR_EMAIL}" ]]; then
+	export DRONE_COMMIT_AUTHOR_EMAIL=drone@localhost
+fi
+
+export GIT_AUTHOR_NAME=${DRONE_COMMIT_AUTHOR_NAME}
+export GIT_AUTHOR_EMAIL=${DRONE_COMMIT_AUTHOR_EMAIL}
+export GIT_COMMITTER_NAME=${DRONE_COMMIT_AUTHOR_NAME}
+export GIT_COMMITTER_EMAIL=${DRONE_COMMIT_AUTHOR_EMAIL}
+
+# invoke the sub-script based on the drone event type.
+# TODO we should ultimately look at the ref, since
+# we need something compatible with deployment events.
+
+CLONE_TYPE=$DRONE_BUILD_EVENT
+case $DRONE_COMMIT_REF in
+  refs/tags/* ) CLONE_TYPE=tag ;;
+esac
+
+case $CLONE_TYPE in
+pull_request)
+	clone-pull-request
+	;;
+tag)
+	clone-tag
+	;;
+*)
+	clone-commit
+	;;
+esac
+`
+
+// Contents of clone-commit
+const CloneCommit = `#!/bin/sh
+
+FLAGS=""
+if [[ ! -z "${PLUGIN_DEPTH}" ]]; then
+	FLAGS="--depth=${PLUGIN_DEPTH}"
+fi
+
+if [ ! -d .git ]; then
+	git init
+	git remote add origin ${DRONE_REMOTE_URL}
+fi
+
+set -e
+set -x
+
+git fetch ${FLAGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:
+git checkout ${DRONE_COMMIT_SHA} -b ${DRONE_COMMIT_BRANCH}
+`
+
+// Contents of clone-pull-request
+const ClonePullRequest = `#!/bin/sh
+
+FLAGS=""
+if [[ ! -z "${PLUGIN_DEPTH}" ]]; then
+	FLAGS="--depth=${PLUGIN_DEPTH}"
+fi
+
+if [ ! -d .git ]; then
+	git init
+	git remote add origin ${DRONE_REMOTE_URL}
+fi
+
+set -e
+set -x
+
+git fetch ${FLAGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:
+git checkout ${DRONE_COMMIT_BRANCH}
+
+git fetch origin ${DRONE_COMMIT_REF}:
+git merge ${DRONE_COMMIT_SHA}
+`
+
+// Contents of clone-tag
+const CloneTag = `#!/bin/sh
+
+FLAGS=""
+if [[ ! -z "${PLUGIN_DEPTH}" ]]; then
+	FLAGS="--depth=${PLUGIN_DEPTH}"
+fi
+
+if [ ! -d .git ]; then
+	git init
+	git remote add origin ${DRONE_REMOTE_URL}
+fi
+
+set -e
+set -x
+
+git fetch ${FLAGS} origin +refs/tags/${DRONE_TAG}:
+git checkout -qf FETCH_HEAD
+`
+

posix/posix_test.go

@@ -166,7 +166,7 @@ func TestPullRequest(t *testing.T) {
 	cmd.Dir = local
 	cmd.Env = []string{
 		fmt.Sprintf("DRONE_COMMIT_REF=%s", "refs/pull/14596/head"),
-		fmt.Sprintf("DRONE_COMMIT_BRANCH=%s", "master"),
+		fmt.Sprintf("DRONE_COMMIT_BRANCH=%s", "main"),
 		fmt.Sprintf("DRONE_COMMIT_SHA=%s", "26923a8f37933ccc23943de0d4ebd53908268582"),
 		fmt.Sprintf("DRONE_WORKSPACE=%s", local),
 		fmt.Sprintf("DRONE_REMOTE_URL=%s", remote),
@@ -195,7 +195,7 @@ func TestPullRequest(t *testing.T) {
 		t.Errorf("Want commit %s, got %s", want, got)
 	}
 
-	if want, got := "master", branch; got != want {
+	if want, got := "main", branch; got != want {
 		t.Errorf("Want branch %s, got %s", want, got)
 	}
 

scripts/includetext.go

@@ -0,0 +1,87 @@
+// +build ignore
+
+package main
+
+import (
+	"bytes"
+	"flag"
+	"io/ioutil"
+	"log"
+	"path/filepath"
+	"strings"
+	"text/template"
+)
+
+var (
+	input  stringSlice
+	output string
+	name   string
+)
+
+func main() {
+	flag.Var(&input, "input", "input files")
+	flag.StringVar(&output, "output", "", "output file")
+	flag.StringVar(&name, "package", "", "package name")
+	flag.Parse()
+
+	var files []File
+	for _, file := range input {
+		out, err := ioutil.ReadFile(file)
+		if err != nil {
+			log.Fatalln(err)
+		}
+		files = append(files, File{
+			Name: file,
+			Slug: slugify(file),
+			Data: string(out),
+		})
+	}
+
+	data := map[string]interface{}{
+		"Files":   files,
+		"Package": name,
+	}
+	buf := new(bytes.Buffer)
+	err := tmpl.Execute(buf, data)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	ioutil.WriteFile(output, buf.Bytes(), 0644)
+}
+
+func slugify(s string) string {
+	ext := filepath.Ext(s)
+	s = strings.TrimSuffix(s, ext)
+	s = strings.Title(s)
+	s = strings.ReplaceAll(s, "-", "")
+	s = strings.ReplaceAll(s, "_", "")
+	return s
+}
+
+type stringSlice []string
+
+func (s *stringSlice) String() string {
+	return strings.Join(*s, ",")
+}
+
+func (s *stringSlice) Set(value string) error {
+	*s = append(*s, value)
+	return nil
+}
+
+type File struct {
+	Name string
+	Data string
+	Slug string
+}
+
+var tmpl = template.Must(template.New("_").Parse(`package {{ .Package }}
+
+// DO NOT EDIT. This file is automatically generated.
+
+{{ range .Files -}}
+// Contents of {{ .Name }}
+const {{ .Slug }} = ` + "`{{ .Data }}`" + `
+
+{{ end -}}`))

windows/clone-commit.ps1

@@ -5,9 +5,13 @@ if ($Env:PLUGIN_DEPTH) {
 }
 
 if (!(Test-Path .git)) {
+	Write-Host 'git init';
 	git init
+	Write-Host "git remote add origin $Env:DRONE_REMOTE_URL"
 	git remote add origin $Env:DRONE_REMOTE_URL
 }
 
-git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:"
+Write-Host "git fetch $FLAGS origin +refs/heads/${Env:DRONE_COMMIT_BRANCH}:";
-git checkout $Env:DRONE_COMMIT_SHA -b $Env:DRONE_COMMIT_BRANCH
+git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:";
+Write-Host "git checkout $Env:DRONE_COMMIT_SHA -f $Env:DRONE_COMMIT_BRANCH";
+git checkout $Env:DRONE_COMMIT_SHA -b $Env:DRONE_COMMIT_BRANCH;

windows/clone-pull-request.ps1

@@ -12,5 +12,5 @@ if (!(Test-Path .git)) {
 git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:"
 git checkout $Env:DRONE_COMMIT_BRANCH
 
-git fetch origin $Env:DRONE_COMMIT_REF:
+git fetch origin "${Env:DRONE_COMMIT_REF}:"
-git rebase $Env:DRONE_COMMIT_SHA
+git merge $Env:DRONE_COMMIT_SHA

windows/clone.ps1

@@ -15,11 +15,11 @@ if ($Env:DRONE_WORKSPACE) {
 # the netrc file.
 
 if ($Env:DRONE_NETRC_MACHINE) {
-
+@"
-$netrc=[string]::Format("{0}\_netrc",$Env:HOME);
+machine $Env:DRONE_NETRC_MACHINE
-"machine $Env:CI_NETRC_MACHINE" >> $netrc;
+login $Env:DRONE_NETRC_USERNAME
-"login $Env:CI_NETRC_USERNAME" >> $netrc;
+password $Env:DRONE_NETRC_PASSWORD
-"password $Env:CI_NETRC_PASSWORD" >> $netrc;
+"@ > (Join-Path $Env:USERPROFILE '_netrc');
 }
 
 # configure git global behavior and parameters via the
@@ -29,16 +29,16 @@ if ($Env:PLUGIN_SKIP_VERIFY) {
     $Env:GIT_SSL_NO_VERIFY = "true"
 }
 
-if ($Env:DRONE_COMMIT_AUTHOR_NAME) {
+if ($Env:DRONE_COMMIT_AUTHOR_NAME -eq '' -or $Env:DRONE_COMMIT_AUTHOR_NAME -eq $null) {
-    $Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME
-} else {
     $Env:GIT_AUTHOR_NAME = "drone"
+} else {
+    $Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME
 }
 
-if ($Env:DRONE_COMMIT_AUTHOR_NAME) {
+if ($Env:DRONE_COMMIT_AUTHOR_EMAIL -eq '' -or $Env:DRONE_COMMIT_AUTHOR_EMAIL -eq $null) {
-    $Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME
+    $Env:GIT_AUTHOR_EMAIL = 'drone@localhost'
 } else {
-    $Env:GIT_AUTHOR_NAME = 'drone@localhost'
+    $Env:GIT_AUTHOR_EMAIL = $Env:DRONE_COMMIT_AUTHOR_EMAIL
 }
 
 $Env:GIT_COMMITTER_NAME  = $Env:GIT_AUTHOR_NAME
@@ -50,7 +50,7 @@ $Env:GIT_COMMITTER_EMAIL = $Env:GIT_AUTHOR_EMAIL
 
 switch ($Env:DRONE_BUILD_EVENT) {
     "pull_request" {
-        Invoke-Expression "${PSScriptRoot}\clone-pull-reqest.ps1"
+        Invoke-Expression "${PSScriptRoot}\clone-pull-request.ps1"
         break
     }
     "tag" {

windows/windows.go

@@ -0,0 +1,3 @@
+package windows
+
+//go:generate go run ../scripts/includetext.go --input=clone.ps1 --input=clone-commit.ps1 --input=clone-pull-request.ps1 --input=clone-tag.ps1 --package=windows --output=windows_gen.go

windows/windows_gen.go

@@ -0,0 +1,126 @@
+package windows
+
+// DO NOT EDIT. This file is automatically generated.
+
+// Contents of clone.ps1
+const Clone = `$ErrorActionPreference = 'Stop';
+
+# HACK: no clue how to set the PATH inside the Dockerfile,
+# so am setting it here instead. This is not idea.
+$Env:PATH += ';C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin'
+
+# if the workspace is set we should make sure
+# it is the current working directory.
+
+if ($Env:DRONE_WORKSPACE) {
+    cd $Env:DRONE_WORKSPACE
+}
+
+# if the netrc enviornment variables exist, write
+# the netrc file.
+
+if ($Env:DRONE_NETRC_MACHINE) {
+@"
+machine $Env:DRONE_NETRC_MACHINE
+login $Env:DRONE_NETRC_USERNAME
+password $Env:DRONE_NETRC_PASSWORD
+"@ > (Join-Path $Env:USERPROFILE '_netrc');
+}
+
+# configure git global behavior and parameters via the
+# following environment variables:
+
+if ($Env:PLUGIN_SKIP_VERIFY) {
+    $Env:GIT_SSL_NO_VERIFY = "true"
+}
+
+if ($Env:DRONE_COMMIT_AUTHOR_NAME -eq '' -or $Env:DRONE_COMMIT_AUTHOR_NAME -eq $null) {
+    $Env:GIT_AUTHOR_NAME = "drone"
+} else {
+    $Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME
+}
+
+if ($Env:DRONE_COMMIT_AUTHOR_EMAIL -eq '' -or $Env:DRONE_COMMIT_AUTHOR_EMAIL -eq $null) {
+    $Env:GIT_AUTHOR_EMAIL = 'drone@localhost'
+} else {
+    $Env:GIT_AUTHOR_EMAIL = $Env:DRONE_COMMIT_AUTHOR_EMAIL
+}
+
+$Env:GIT_COMMITTER_NAME  = $Env:GIT_AUTHOR_NAME
+$Env:GIT_COMMITTER_EMAIL = $Env:GIT_AUTHOR_EMAIL
+
+# invoke the sub-script based on the drone event type.
+# TODO we should ultimately look at the ref, since
+# we need something compatible with deployment events.
+
+switch ($Env:DRONE_BUILD_EVENT) {
+    "pull_request" {
+        Invoke-Expression "${PSScriptRoot}\clone-pull-request.ps1"
+        break
+    }
+    "tag" {
+        Invoke-Expression "${PSScriptRoot}\clone-tag.ps1"
+        break
+    }
+    default {
+        Invoke-Expression "${PSScriptRoot}\clone-commit.ps1"
+        break
+    }
+}
+`
+
+// Contents of clone-commit.ps1
+const CloneCommit = `
+Set-Variable -Name "FLAGS" -Value ""
+if ($Env:PLUGIN_DEPTH) {
+    Set-Variable -Name "FLAGS" -Value "--depth=$Env:PLUGIN_DEPTH" 
+}
+
+if (!(Test-Path .git)) {
+	Write-Host 'git init';
+	git init
+	Write-Host "git remote add origin $Env:DRONE_REMOTE_URL"
+	git remote add origin $Env:DRONE_REMOTE_URL
+}
+
+Write-Host "git fetch $FLAGS origin +refs/heads/${Env:DRONE_COMMIT_BRANCH}:";
+git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:";
+Write-Host "git checkout $Env:DRONE_COMMIT_SHA -f $Env:DRONE_COMMIT_BRANCH";
+git checkout $Env:DRONE_COMMIT_SHA -b $Env:DRONE_COMMIT_BRANCH;
+`
+
+// Contents of clone-pull-request.ps1
+const ClonePullRequest = `
+Set-Variable -Name "FLAGS" -Value ""
+if ($Env:PLUGIN_DEPTH) {
+    Set-Variable -Name "FLAGS" -Value "--depth=$Env:PLUGIN_DEPTH"
+}
+
+if (!(Test-Path .git)) {
+	git init
+	git remote add origin $Env:DRONE_REMOTE_URL
+}
+
+git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:"
+git checkout $Env:DRONE_COMMIT_BRANCH
+
+git fetch origin "${Env:DRONE_COMMIT_REF}:"
+git merge $Env:DRONE_COMMIT_SHA
+`
+
+// Contents of clone-tag.ps1
+const CloneTag = `
+Set-Variable -Name "FLAGS" -Value ""
+if ($Env:PLUGIN_DEPTH) {
+    Set-Variable -Name "FLAGS" -Value "--depth=$Env:PLUGIN_DEPTH" 
+}
+
+if (!(Test-Path .git)) {
+	git init
+	git remote add origin $Env:DRONE_REMOTE_URL
+}
+
+git fetch $FLAGS origin "+refs/tags/${Env:DRONE_TAG}:"
+git checkout -qf FETCH_HEAD
+`
+