Skip to content

Commit 3a95de8

Browse files
authored
Merge pull request #356 from aws/develop
chore: Merge develop into master
2 parents 61f74a2 + ef19e9f commit 3a95de8

File tree

31 files changed

+7
-910
lines changed

31 files changed

+7
-910
lines changed

.appveyor.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,8 @@ for:
5959
# setup go
6060
- rmdir c:\go /s /q
6161
- "choco install golang --version 1.15.7"
62-
- "choco install bzr"
63-
- "choco install dep"
6462
- setx PATH "C:\go\bin;C:\gopath\bin;C:\Program Files (x86)\Bazaar\;C:\Program Files\Mercurial;%PATH%;"
6563
- "go version"
66-
# set set GO111MODULE to auto to enable module-aware mode only when a go.mod file is present in the current directory or any parent directory
67-
# https://blog.golang.org/go116-module-changes#TOC_2.
68-
# This is required for the go dep integration tests
69-
- "go env -w GO111MODULE=auto"
7064
- "go env"
7165

7266
# setup Gradle
@@ -101,14 +95,9 @@ for:
10195

10296
# Install latest gradle
10397
- sh: "sudo apt-get -y remove gradle"
104-
- sh: "sudo apt-get install go-dep"
10598
- sh: "wget https://services.gradle.org/distributions/gradle-5.5-bin.zip -P /tmp"
10699
- sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
107100
- sh: "PATH=/opt/gradle/gradle-5.5/bin:$PATH"
108-
# set set GO111MODULE to auto to enable module-aware mode only when a go.mod file is present in the current directory or any parent directory
109-
# https://blog.golang.org/go116-module-changes#TOC_2.
110-
# This is required for the go dep integration tests
111-
- sh: "go env -w GO111MODULE=auto"
112101

113102
build_script:
114103
- 'python -c "import sys; print(sys.executable)"'

aws_lambda_builders/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
22
AWS Lambda Builder Library
33
"""
4-
__version__ = "1.14.0"
4+
__version__ = "1.15.0"
55
RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import aws_lambda_builders.workflows.python_pip
66
import aws_lambda_builders.workflows.nodejs_npm
77
import aws_lambda_builders.workflows.ruby_bundler
8-
import aws_lambda_builders.workflows.go_dep
98
import aws_lambda_builders.workflows.go_modules
109
import aws_lambda_builders.workflows.java_gradle
1110
import aws_lambda_builders.workflows.java_maven

aws_lambda_builders/workflows/custom_make/make.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ def run(self, args, env=None, cwd=None):
8484

8585
out, err = p.communicate()
8686

87+
# Typically this type of information is logged to DEBUG, however, since the Make builder
88+
# can be different per customer's use case, it is helpful to always log the output so
89+
# developers can diagnose any issues.
90+
LOG.info(out.decode("utf8").strip())
91+
8792
if p.returncode != 0:
8893
raise MakeExecutionError(message=err.decode("utf8").strip())
8994

aws_lambda_builders/workflows/go_dep/DESIGN.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

aws_lambda_builders/workflows/go_dep/__init__.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

aws_lambda_builders/workflows/go_dep/actions.py

Lines changed: 0 additions & 70 deletions
This file was deleted.

aws_lambda_builders/workflows/go_dep/subproc_exec.py

Lines changed: 0 additions & 89 deletions
This file was deleted.

aws_lambda_builders/workflows/go_dep/utils.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

aws_lambda_builders/workflows/go_dep/workflow.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)