From 4c54ea7d7806ec9662dce03dc56f5e1f9357e6fa Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Sun, 12 Jun 2022 10:11:56 +0200 Subject: [PATCH] Construct the GH Action environments with a Generator Contributes to CURA-9365 --- generators/GitHubActionsBuildEnv.py | 4 +++- generators/GitHubActionsRunEnv.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/generators/GitHubActionsBuildEnv.py b/generators/GitHubActionsBuildEnv.py index c069d14..cfd5aed 100644 --- a/generators/GitHubActionsBuildEnv.py +++ b/generators/GitHubActionsBuildEnv.py @@ -23,5 +23,7 @@ class GitHubActionsBuildEnv(Generator): @property def content(self): template = Template("""{% for k, v in envvars.items() %}echo "{{ k }}={{ v }}" >> $GITHUB_ENV\n{% endfor %}""") - envvars = self.conanfile.buildenv_info.vars(self.conanfile) + build_env = VirtualBuildEnv(self.conanfile) + env = build_env.environment() + envvars = env.vars(self.conanfile, scope = "build") return template.render(envvars = envvars) diff --git a/generators/GitHubActionsRunEnv.py b/generators/GitHubActionsRunEnv.py index d5738fe..ad7b0e5 100644 --- a/generators/GitHubActionsRunEnv.py +++ b/generators/GitHubActionsRunEnv.py @@ -23,5 +23,7 @@ class GitHubActionsRunEnv(Generator): @property def content(self): template = Template("""{% for k, v in envvars.items() %}echo "{{ k }}={{ v }}" >> $GITHUB_ENV\n{% endfor %}""") - envvars = self.conanfile.runenv_info.vars(self.conanfile, scope = "run") + build_env = VirtualRunEnv(self.conanfile) + env = build_env.environment() + envvars = env.vars(self.conanfile, scope = "run") return template.render(envvars = envvars)