diff --git a/generators/GitHubActionsBuildEnv.py b/generators/GitHubActionsBuildEnv.py index cfd5aed..d7b7305 100644 --- a/generators/GitHubActionsBuildEnv.py +++ b/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) diff --git a/generators/GitHubActionsRunEnv.py b/generators/GitHubActionsRunEnv.py index ad7b0e5..b79a130 100644 --- a/generators/GitHubActionsRunEnv.py +++ b/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) diff --git a/generators/VirtualPythonEnv.py b/generators/VirtualPythonEnv.py index 99335c4..58ff3ff 100644 --- a/generators/VirtualPythonEnv.py +++ b/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, diff --git a/generators/VirtualPythonEnvResources/activate_github_actions_buildenv.jinja b/generators/VirtualPythonEnvResources/activate_github_actions_buildenv.jinja index cd04273..8150c31 100644 --- a/generators/VirtualPythonEnvResources/activate_github_actions_buildenv.jinja +++ b/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 %}