Browse Source

Use the correct Env naming scheme depending on OS

Contributes to CURA-9365
fix_tk_recipe_env_info
j.spijker@ultimaker.com 4 years ago committed by Jelle Spijker
parent
commit
cd24959ffc
  1. 5
      generators/GitHubActionsBuildEnv.py
  2. 5
      generators/GitHubActionsRunEnv.py
  3. 3
      generators/VirtualPythonEnv.py
  4. 2
      generators/VirtualPythonEnvResources/activate_github_actions_buildenv.jinja

5
generators/GitHubActionsBuildEnv.py

@ -22,8 +22,9 @@ class GitHubActionsBuildEnv(Generator):
@property
def content(self):
template = Template("""{% for k, v in envvars.items() %}echo "{{ k }}={{ v }}" >> $GITHUB_ENV\n{% endfor %}""")
template = Template("""{% for k, v in envvars.items() %}echo "{{ k }}={{ v }}" >> ${{ env_prefix }}GITHUB_ENV\n{% endfor %}""")
build_env = VirtualBuildEnv(self.conanfile)
env = build_env.environment()
envvars = env.vars(self.conanfile, scope = "build")
return template.render(envvars = envvars)
env_prefix = "Env:" if self.conanfile.settings.os == "Windows" else ""
return template.render(envvars = envvars, env_prefix = env_prefix)

5
generators/GitHubActionsRunEnv.py

@ -22,8 +22,9 @@ class GitHubActionsRunEnv(Generator):
@property
def content(self):
template = Template("""{% for k, v in envvars.items() %}echo "{{ k }}={{ v }}" >> $GITHUB_ENV\n{% endfor %}""")
template = Template("""{% for k, v in envvars.items() %}echo "{{ k }}={{ v }}" >> ${{ env_prefix }}GITHUB_ENV\n{% endfor %}""")
build_env = VirtualRunEnv(self.conanfile)
env = build_env.environment()
envvars = env.vars(self.conanfile, scope = "run")
return template.render(envvars = envvars)
env_prefix = "Env:" if self.conanfile.settings.os == "Windows" else ""
return template.render(envvars = envvars, env_prefix = env_prefix)

3
generators/VirtualPythonEnv.py

@ -142,7 +142,8 @@ class VirtualPythonEnv(Generator):
activate_sh = Template(f.read()).render(envvars = envvars, prompt = self.conanfile.name)
with open(Path(__file__).parent.joinpath("VirtualPythonEnvResources", "activate_github_actions_buildenv.jinja"), "r") as f:
activate_github_actions_buildenv = Template(f.read()).render(envvars = envvars, prompt = self.conanfile.name)
env_prefix = "Env:" if self.conanfile.settings.os == "Windows" else ""
activate_github_actions_buildenv = Template(f.read()).render(envvars = envvars, env_prefix = env_prefix)
return {
str(Path(self.conanfile.build_folder, self._venv_path, "activate.bat")): activate_bat,

2
generators/VirtualPythonEnvResources/activate_github_actions_buildenv.jinja

@ -1,2 +1,2 @@
{% for var, value in envvars.items() %}echo "{{ var }}={{ value }}" >> $GITHUB_ENV
{% for var, value in envvars.items() %}echo "{{ var }}={{ value }}" >> ${{ env_prefix }}GITHUB_ENV
{% endfor %}

Loading…
Cancel
Save