Skip to content

Support go1.x builder with the provided.al2 runtime #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mndeveci merged 6 commits into from
Oct 26, 2022
Merged

Support go1.x builder with the provided.al2 runtime #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a521b9a
Support go1.x builder with the provided.al2 runtime
bmoffatt Sep 11, 2022
05b184f
don't attempt to parse the minimum compiler version from the runtime …
bmoffatt Oct 11, 2022
3f7097e
Merge branch 'develop' into develop
bmoffatt Oct 11, 2022
dac7127
format check failed
bmoffatt Oct 19, 2022
5658f66
Merge branch 'develop' into develop
bmoffatt Oct 19, 2022
7d256b4
ci test commit - probe default go version
bmoffatt Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ for:
- sh: "nvm install ${nodejs_version}"
- sh: "npm install npm@7.24.2 -g"
- sh: "npm -v"
- sh: "go version"
- sh: "echo $PATH"
- sh: "java --version"

Expand Down
7 changes: 3 additions & 4 deletions aws_lambda_builders/workflows/go_modules/validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,14 @@ def validate(self, runtime_path):

runtime_path = super(GoRuntimeValidator, self).validate(runtime_path)

expected_major_version = int(self.runtime.replace(self.LANGUAGE, "").split(".")[0])
min_expected_minor_version = 11 if expected_major_version == 1 else 0

p = subprocess.Popen([runtime_path, "version"], cwd=os.getcwd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
version_string, _ = p.communicate()

if p.returncode == 0:
major_version, minor_version = GoRuntimeValidator.get_go_versions(version_string.decode())
if major_version == expected_major_version and minor_version >= min_expected_minor_version:
min_expected_major_version = 1
min_expected_minor_version = 11 if major_version == 1 else 0
if major_version >= min_expected_major_version and minor_version >= min_expected_minor_version:
self._valid_runtime_path = runtime_path
return self._valid_runtime_path

Expand Down