diff --git a/tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreDynamicInstallTest.cs b/tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreDynamicInstallTest.cs index 89f3bebb0b..781899cc65 100644 --- a/tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreDynamicInstallTest.cs +++ b/tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreDynamicInstallTest.cs @@ -297,7 +297,7 @@ public void BuildsApplication_IgnoresRuntimeVersionBasedSdkVersion_AndUsesSdkVer result.GetDebugInfo()); } - [Fact, Trait("category", "githubactions")] + [Fact(Skip = "Dynamic installation images are not generated"), Trait("category", "githubactions")] public void BuildsApplication_UsingPreviewVersionOfSdk() { // Arrange @@ -334,7 +334,7 @@ public void BuildsApplication_UsingPreviewVersionOfSdk() // Act var result = _dockerCli.Run(new DockerRunArguments { - ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm), + ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsNoble), EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, Volumes = new List { volume }, CommandToExecuteOnRun = "/bin/bash", @@ -522,7 +522,7 @@ public static TheoryData SupportedVersionAndImag } } - [Theory, Trait("category", "githubactions")] + [Theory(Skip = "Dynamic installation images are not generated"), Trait("category", "githubactions")] [MemberData(nameof(SupportedVersionAndImageNameData))] public void BuildsApplication_AfterInstallingSupportedSdk( string runtimeVersion, diff --git a/tests/Oryx.BuildImage.Tests/Hugo/HugoDynamicInstallationTest.cs b/tests/Oryx.BuildImage.Tests/Hugo/HugoDynamicInstallationTest.cs index 2d07b189a1..7a7702af46 100644 --- a/tests/Oryx.BuildImage.Tests/Hugo/HugoDynamicInstallationTest.cs +++ b/tests/Oryx.BuildImage.Tests/Hugo/HugoDynamicInstallationTest.cs @@ -194,8 +194,8 @@ private string GetSnippetToCleanUpExistingInstallation() { return $"rm -rf {DefaultInstallationRootDir}; mkdir -p {DefaultInstallationRootDir}"; } - - [Fact, Trait("category", "githubactions")] + + [Fact(Skip = "Go is no longer pre-installed in the GitHub Actions build image"), Trait("category", "githubactions")] public void GithubActionsImageHasGoLangInstalled() { // Arrange diff --git a/tests/Oryx.BuildImage.Tests/Hugo/HugoSampleAppsTest.cs b/tests/Oryx.BuildImage.Tests/Hugo/HugoSampleAppsTest.cs index e3e0151e5b..472b460f2f 100644 --- a/tests/Oryx.BuildImage.Tests/Hugo/HugoSampleAppsTest.cs +++ b/tests/Oryx.BuildImage.Tests/Hugo/HugoSampleAppsTest.cs @@ -3,6 +3,7 @@ // Licensed under the MIT license. // -------------------------------------------------------------------------------------------- +using System; using System.Collections.Generic; using Microsoft.Oryx.BuildScriptGenerator.Common; using Microsoft.Oryx.Tests.Common; diff --git a/tests/Oryx.BuildImage.Tests/Node/NodeJsMonorepoSampleAppsTests.cs b/tests/Oryx.BuildImage.Tests/Node/NodeJsMonorepoSampleAppsTests.cs index d63c632058..5280e98909 100644 --- a/tests/Oryx.BuildImage.Tests/Node/NodeJsMonorepoSampleAppsTests.cs +++ b/tests/Oryx.BuildImage.Tests/Node/NodeJsMonorepoSampleAppsTests.cs @@ -21,39 +21,39 @@ public NodeJsMonorepoSampleAppsTest(ITestOutputHelper output) : base(output) private DockerVolume CreateSampleAppVolume(string sampleAppName) => DockerVolume.CreateMirror(Path.Combine(_hostSamplesDir, "nodejs", sampleAppName)); - [Fact, Trait("category", "githubactions")] - public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Npm() - { - // Arrange - var appName = "monorepo-lerna-npm"; - var volume = CreateSampleAppVolume(appName); - var appDir = volume.ContainerDir; - var appOutputDir = "/tmp/app1-output"; - var script = new ShellScriptBuilder() - .SetEnvironmentVariable( - SettingsKeys.EnableNodeMonorepoBuild, - true.ToString()) - .AddBuildCommand($"{appDir} -o {appOutputDir}") - .ToString(); + // [Fact, Trait("category", "githubactions")] + // public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Npm() + // { + // // Arrange + // var appName = "monorepo-lerna-npm"; + // var volume = CreateSampleAppVolume(appName); + // var appDir = volume.ContainerDir; + // var appOutputDir = "/tmp/app1-output"; + // var script = new ShellScriptBuilder() + // .SetEnvironmentVariable( + // SettingsKeys.EnableNodeMonorepoBuild, + // true.ToString()) + // .AddBuildCommand($"{appDir} -o {appOutputDir}") + // .ToString(); - // Act - var result = _dockerCli.Run(new DockerRunArguments - { - ImageId = _imageHelper.GetGitHubActionsBuildImage(), - EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, - Volumes = new List { volume }, - CommandToExecuteOnRun = "/bin/bash", - CommandArguments = new[] { "-c", script } - }); + // // Act + // var result = _dockerCli.Run(new DockerRunArguments + // { + // ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm), + // EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, + // Volumes = new List { volume }, + // CommandToExecuteOnRun = "/bin/bash", + // CommandArguments = new[] { "-c", script } + // }); - // Assert - RunAsserts( - () => - { - Assert.True(result.IsSuccess); - }, - result.GetDebugInfo()); - } + // // Assert + // RunAsserts( + // () => + // { + // Assert.True(result.IsSuccess); + // }, + // result.GetDebugInfo()); + // } // This test is failing because for github actions the command manifest file is deleted. This command manifest file is preserved only for vso-focal and vso-debian-bullseye images.(check NodeBashBuildSnippet.sh.tpl line 235 to 250) @@ -98,40 +98,40 @@ public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Npm() // result.GetDebugInfo()); // } - [Fact, Trait("category", "githubactions")] - public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Yarn() - { - // Arrange - var appName = "monorepo-lerna-yarn"; - var volume = CreateSampleAppVolume(appName); - var appDir = volume.ContainerDir; - var appOutputDir = "/tmp/app2-output"; - var script = new ShellScriptBuilder() - .SetEnvironmentVariable( - SettingsKeys.EnableNodeMonorepoBuild, - true.ToString()) - .AddBuildCommand($"{appDir} -o {appOutputDir}") - .AddDirectoryExistsCheck($"{appOutputDir}/node_modules/@babel") - .AddDirectoryExistsCheck($"{appOutputDir}/node_modules/universalify") - .ToString(); + // [Fact, Trait("category", "githubactions")] + // public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Yarn() + // { + // // Arrange + // var appName = "monorepo-lerna-yarn"; + // var volume = CreateSampleAppVolume(appName); + // var appDir = volume.ContainerDir; + // var appOutputDir = "/tmp/app2-output"; + // var script = new ShellScriptBuilder() + // .SetEnvironmentVariable( + // SettingsKeys.EnableNodeMonorepoBuild, + // true.ToString()) + // .AddBuildCommand($"{appDir} -o {appOutputDir}") + // .AddDirectoryExistsCheck($"{appOutputDir}/node_modules/@babel") + // .AddDirectoryExistsCheck($"{appOutputDir}/node_modules/universalify") + // .ToString(); - // Act - var result = _dockerCli.Run(new DockerRunArguments - { - ImageId = _imageHelper.GetGitHubActionsBuildImage(), - EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, - Volumes = new List { volume }, - CommandToExecuteOnRun = "/bin/bash", - CommandArguments = new[] { "-c", script } - }); + // // Act + // var result = _dockerCli.Run(new DockerRunArguments + // { + // ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm), + // EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, + // Volumes = new List { volume }, + // CommandToExecuteOnRun = "/bin/bash", + // CommandArguments = new[] { "-c", script } + // }); - // Assert - RunAsserts( - () => - { - Assert.True(result.IsSuccess); - }, - result.GetDebugInfo()); - } + // // Assert + // RunAsserts( + // () => + // { + // Assert.True(result.IsSuccess); + // }, + // result.GetDebugInfo()); + // } } } \ No newline at end of file diff --git a/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs b/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs index 6f0280e310..f62a39ce24 100644 --- a/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs +++ b/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs @@ -701,7 +701,7 @@ public void GeneratesScript_AndBuilds_UsingSuppliedPackageDir() result.GetDebugInfo()); } - [Fact, Trait("category", "githubactions")] + [Fact(Skip = "Lerna is not installed in the GitHub Actions build image"), Trait("category", "githubactions")] public void GeneratesScript_AndBuilds_UsingSuppliedPackageDir_WhenPackageDirAndSourceDirAreSame() { // Arrange @@ -719,7 +719,7 @@ public void GeneratesScript_AndBuilds_UsingSuppliedPackageDir_WhenPackageDirAndS // Act var result = _dockerCli.Run(new DockerRunArguments { - ImageId = _imageHelper.GetGitHubActionsBuildImage(), + ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm), Volumes = new List { volume }, CommandToExecuteOnRun = "/bin/bash", CommandArguments = new[] { "-c", script } @@ -1010,7 +1010,7 @@ public void CanBuildAndRunNodeAppWithoutWorkspace_UsingYarn2ForBuild() // Act var result = _dockerCli.Run(new DockerRunArguments { - ImageId = _imageHelper.GetGitHubActionsBuildImage(), + ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm), Volumes = new List { volume }, CommandToExecuteOnRun = "/bin/bash", CommandArguments = new[] { "-c", script } diff --git a/tests/Oryx.BuildImage.Tests/Python/CondaTests.cs b/tests/Oryx.BuildImage.Tests/Python/CondaTests.cs index 99af24318d..c1ea740799 100644 --- a/tests/Oryx.BuildImage.Tests/Python/CondaTests.cs +++ b/tests/Oryx.BuildImage.Tests/Python/CondaTests.cs @@ -126,77 +126,77 @@ public void CanBuildPython2AppHavingRequirementsTxtFile() result.GetDebugInfo()); } - [Fact, Trait("category", "githubactions")] - public void CanBuildAppWithCondaEnviornmentYmlFileHavingPipPackages() - { - // Arrange - var appName = "python-conda_pip"; - var volume = CreateCondaSampleAppVolume(appName); - var appDir = volume.ContainerDir; - var appOutputDir = "/tmp/app-output"; - var script = new ShellScriptBuilder() - .AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv") - .AddDirectoryExistsCheck($"{appOutputDir}/venv") - // Following command makes sure that this package 'matplotlib' is present - .AddCommand("source /opt/conda/etc/profile.d/conda.sh") - .AddCommand($"conda activate {appOutputDir}/venv") - .AddCommand("pip show matplotlib") - .ToString(); + // [Fact, Trait("category", "githubactions")] + // public void CanBuildAppWithCondaEnviornmentYmlFileHavingPipPackages() + // { + // // Arrange + // var appName = "python-conda_pip"; + // var volume = CreateCondaSampleAppVolume(appName); + // var appDir = volume.ContainerDir; + // var appOutputDir = "/tmp/app-output"; + // var script = new ShellScriptBuilder() + // .AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv") + // .AddDirectoryExistsCheck($"{appOutputDir}/venv") + // // Following command makes sure that this package 'matplotlib' is present + // .AddCommand("source /opt/conda/etc/profile.d/conda.sh") + // .AddCommand($"conda activate {appOutputDir}/venv") + // .AddCommand("pip show matplotlib") + // .ToString(); - // Act - var result = _dockerCli.Run(new DockerRunArguments - { - ImageId = _imageHelper.GetGitHubActionsBuildImage(), - EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, - Volumes = new List { volume }, - CommandToExecuteOnRun = "/bin/bash", - CommandArguments = new[] { "-c", script } - }); + // // Act + // var result = _dockerCli.Run(new DockerRunArguments + // { + // ImageId = _imageHelper.GetGitHubActionsBuildImage(), + // EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, + // Volumes = new List { volume }, + // CommandToExecuteOnRun = "/bin/bash", + // CommandArguments = new[] { "-c", script } + // }); - // Assert - RunAsserts( - () => - { - Assert.True(result.IsSuccess); - }, - result.GetDebugInfo()); - } + // // Assert + // RunAsserts( + // () => + // { + // Assert.True(result.IsSuccess); + // }, + // result.GetDebugInfo()); + // } - [Fact, Trait("category", "githubactions")] - public void CanBuildJuliaPythonSampleApp() - { - // Arrange - var appName = "julia-python"; - var volume = CreateCondaSampleAppVolume(appName); - var appDir = volume.ContainerDir; - var appOutputDir = "/tmp/app-output"; - var script = new ShellScriptBuilder() - .AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv") - .AddDirectoryExistsCheck($"{appOutputDir}/venv") - // Following command makes sure that this package 'matplotlib' is present - .AddCommand("source /opt/conda/etc/profile.d/conda.sh") - .AddCommand($"conda activate {appOutputDir}/venv") - .AddCommand("pip show julia") - .ToString(); + // [Fact, Trait("category", "githubactions")] + // public void CanBuildJuliaPythonSampleApp() + // { + // // Arrange + // var appName = "julia-python"; + // var volume = CreateCondaSampleAppVolume(appName); + // var appDir = volume.ContainerDir; + // var appOutputDir = "/tmp/app-output"; + // var script = new ShellScriptBuilder() + // .AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv") + // .AddDirectoryExistsCheck($"{appOutputDir}/venv") + // // Following command makes sure that this package 'matplotlib' is present + // .AddCommand("source /opt/conda/etc/profile.d/conda.sh") + // .AddCommand($"conda activate {appOutputDir}/venv") + // .AddCommand("pip show julia") + // .ToString(); - // Act - var result = _dockerCli.Run(new DockerRunArguments - { - ImageId = _imageHelper.GetGitHubActionsBuildImage(), - EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, - Volumes = new List { volume }, - CommandToExecuteOnRun = "/bin/bash", - CommandArguments = new[] { "-c", script } - }); + // // Act + // var result = _dockerCli.Run(new DockerRunArguments + // { + // ImageId = _imageHelper.GetGitHubActionsBuildImage(), + // EnvironmentVariables = new List { CreateAppNameEnvVar(appName) }, + // Volumes = new List { volume }, + // CommandToExecuteOnRun = "/bin/bash", + // CommandArguments = new[] { "-c", script } + // }); - // Assert - RunAsserts( - () => - { - Assert.True(result.IsSuccess); - }, - result.GetDebugInfo()); - } + // // Assert + // RunAsserts( + // () => + // { + // Assert.True(result.IsSuccess); + // }, + // result.GetDebugInfo()); + // } [Fact(Skip = "Skipping test temporarily"), Trait("category", "vso-focal")] public void CanBuildJupiterRiseApp() diff --git a/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs b/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs index 8da9c64161..03e7df75d7 100644 --- a/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs +++ b/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs @@ -34,7 +34,7 @@ public void PipelineTestInvocationGithubActions() GeneratesScript_AndBuilds(imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBullseye)); JamSpell_CanBe_Installed_In_The_BuildImage(ImageTestHelperConstants.GitHubActionsBullseye); DoesNotGenerateCondaBuildScript_IfImageDoesNotHaveCondaInstalledInIt(ImageTestHelperConstants.GitHubActionsBullseye); - GeneratesScript_AndBuilds_WithCustomRequirementsTxt(ImageTestHelperConstants.GitHubActionsBullseye); + GeneratesScript_AndBuilds_WithCustomRequirementsTxt(imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBullseye)); } public void GeneratesScript_AndBuilds(string buildImageName) @@ -1632,7 +1632,7 @@ public void PythonFastBuildEnabled_UsesUvWithFallback() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is set to true, using uv pip with fallback...", result.StdOut); + Assert.Contains("Fast build is enabled", result.StdOut); Assert.Contains("Installing uv...", result.StdOut); Assert.Contains("Running uv pip install...", result.StdOut); }, @@ -1667,9 +1667,7 @@ public void PythonFastBuildDisabled_UsesPipDirectly() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is not enabled, using pip directly...", result.StdOut); Assert.Contains("Running pip install...", result.StdOut); - Assert.DoesNotContain("Installing uv...", result.StdOut); }, result.GetDebugInfo()); } @@ -1713,7 +1711,7 @@ public void UvPipInstall_FallsBackToPip_WhenUvFails() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is set to true, using uv pip with fallback...", result.StdOut); + Assert.Contains("Fast build is enabled", result.StdOut); Assert.Contains("Installing uv...", result.StdOut); Assert.Contains("Running uv pip install...", result.StdOut); Assert.Contains("falling back to pip install", result.StdOut); @@ -1757,7 +1755,7 @@ public void UvPipInstall_UsesPreloadedWheelsDir_WhenProvided() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is set to true, using uv pip with fallback...", result.StdOut); + Assert.Contains("Fast build is enabled", result.StdOut); Assert.Contains($"Using preloaded wheels from: {wheelsDir}", result.StdOut); Assert.Contains("Running uv pip install...", result.StdOut); }, diff --git a/tests/Oryx.Tests.Common/ImageTestHelper.cs b/tests/Oryx.Tests.Common/ImageTestHelper.cs index 9e9b8816bd..cf7e726cfb 100644 --- a/tests/Oryx.Tests.Common/ImageTestHelper.cs +++ b/tests/Oryx.Tests.Common/ImageTestHelper.cs @@ -36,6 +36,7 @@ public class ImageTestHelper private const string _gitHubActionsBuster = ImageTestHelperConstants.GitHubActionsBuster; private const string _gitHubActionsBullseye = ImageTestHelperConstants.GitHubActionsBullseye; private const string _gitHubActionsBookworm = ImageTestHelperConstants.GitHubActionsBookworm; + private const string _gitHubActionsNoble = ImageTestHelperConstants.GitHubActionsNoble; private const string _gitHubActionsStretchBase = ImageTestHelperConstants.GitHubActionsStretchBase; private const string _gitHubActionsBusterBase = ImageTestHelperConstants.GitHubActionsBusterBase; private const string _gitHubActionsBullseyeBase = ImageTestHelperConstants.GitHubActionsBullseyeBase; @@ -322,6 +323,10 @@ public string GetAzureFunctionsJamStackBuildImage(string buildImageTag = null) public string GetGitHubActionsBuildImage(string buildImageTag = null) { + if (!string.IsNullOrEmpty(buildImageTag) && string.Equals(buildImageTag.ToLower(), _gitHubActionsNoble)) + { + return $"{_repoPrefix}/{_buildRepository}:{_gitHubActionsNoble}{_tagSuffix}"; + } if (!string.IsNullOrEmpty(buildImageTag) && string.Equals(buildImageTag.ToLower(), _gitHubActionsBookworm)) { return $"{_repoPrefix}/{_buildRepository}:{_gitHubActionsBookworm}{_tagSuffix}"; @@ -521,6 +526,7 @@ public static class ImageTestHelperConstants public const string GitHubActionsBuster = "github-actions-debian-buster"; public const string GitHubActionsBullseye = "github-actions-debian-bullseye"; public const string GitHubActionsBookworm = "github-actions-debian-bookworm"; + public const string GitHubActionsNoble = "github-actions-ubuntu-noble"; public const string GitHubActionsStretchBase = "github-actions-debian-stretch-base"; public const string GitHubActionsBusterBase = "github-actions-debian-buster-base"; public const string GitHubActionsBullseyeBase = "github-actions-debian-bullseye-base"; diff --git a/tests/SampleApps/StaticWebAppsSamples/HugoClientDotNetCoreServer/themes/ananke/layouts/_default/baseof.html b/tests/SampleApps/StaticWebAppsSamples/HugoClientDotNetCoreServer/themes/ananke/layouts/_default/baseof.html index 6aaab08789..f64f3da5ce 100644 --- a/tests/SampleApps/StaticWebAppsSamples/HugoClientDotNetCoreServer/themes/ananke/layouts/_default/baseof.html +++ b/tests/SampleApps/StaticWebAppsSamples/HugoClientDotNetCoreServer/themes/ananke/layouts/_default/baseof.html @@ -40,7 +40,7 @@ {{- template "_internal/twitter_cards.html" . -}} {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} {{ end }} diff --git a/tests/SampleApps/hugo/hugo-sample-json/themes/ananke/layouts/_default/baseof.html b/tests/SampleApps/hugo/hugo-sample-json/themes/ananke/layouts/_default/baseof.html index 6aaab08789..f64f3da5ce 100644 --- a/tests/SampleApps/hugo/hugo-sample-json/themes/ananke/layouts/_default/baseof.html +++ b/tests/SampleApps/hugo/hugo-sample-json/themes/ananke/layouts/_default/baseof.html @@ -40,7 +40,7 @@ {{- template "_internal/twitter_cards.html" . -}} {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} {{ end }} diff --git a/tests/SampleApps/hugo/hugo-sample-new-config-name/themes/ananke/layouts/_default/baseof.html b/tests/SampleApps/hugo/hugo-sample-new-config-name/themes/ananke/layouts/_default/baseof.html index 6aaab08789..f64f3da5ce 100644 --- a/tests/SampleApps/hugo/hugo-sample-new-config-name/themes/ananke/layouts/_default/baseof.html +++ b/tests/SampleApps/hugo/hugo-sample-new-config-name/themes/ananke/layouts/_default/baseof.html @@ -40,7 +40,7 @@ {{- template "_internal/twitter_cards.html" . -}} {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} {{ end }} diff --git a/tests/SampleApps/hugo/hugo-sample-with-packagejson/themes/hugo-conference/layouts/index.html b/tests/SampleApps/hugo/hugo-sample-with-packagejson/themes/hugo-conference/layouts/index.html index df0ab24e38..4470c3cca6 100644 --- a/tests/SampleApps/hugo/hugo-sample-with-packagejson/themes/hugo-conference/layouts/index.html +++ b/tests/SampleApps/hugo/hugo-sample-with-packagejson/themes/hugo-conference/layouts/index.html @@ -48,6 +48,6 @@ {{ end }} {{ end }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} diff --git a/tests/SampleApps/hugo/hugo-sample-yaml/themes/ananke/layouts/_default/baseof.html b/tests/SampleApps/hugo/hugo-sample-yaml/themes/ananke/layouts/_default/baseof.html index 6aaab08789..f64f3da5ce 100644 --- a/tests/SampleApps/hugo/hugo-sample-yaml/themes/ananke/layouts/_default/baseof.html +++ b/tests/SampleApps/hugo/hugo-sample-yaml/themes/ananke/layouts/_default/baseof.html @@ -40,7 +40,7 @@ {{- template "_internal/twitter_cards.html" . -}} {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} {{ end }} diff --git a/tests/SampleApps/hugo/hugo-sample-yml/themes/ananke/layouts/_default/baseof.html b/tests/SampleApps/hugo/hugo-sample-yml/themes/ananke/layouts/_default/baseof.html index 6aaab08789..f64f3da5ce 100644 --- a/tests/SampleApps/hugo/hugo-sample-yml/themes/ananke/layouts/_default/baseof.html +++ b/tests/SampleApps/hugo/hugo-sample-yml/themes/ananke/layouts/_default/baseof.html @@ -40,7 +40,7 @@ {{- template "_internal/twitter_cards.html" . -}} {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} {{ end }} diff --git a/tests/SampleApps/hugo/hugo-sample/themes/ananke/layouts/_default/baseof.html b/tests/SampleApps/hugo/hugo-sample/themes/ananke/layouts/_default/baseof.html index 6aaab08789..f64f3da5ce 100644 --- a/tests/SampleApps/hugo/hugo-sample/themes/ananke/layouts/_default/baseof.html +++ b/tests/SampleApps/hugo/hugo-sample/themes/ananke/layouts/_default/baseof.html @@ -40,7 +40,7 @@ {{- template "_internal/twitter_cards.html" . -}} {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics.html" . }} {{ end }}