From bb3b54d5b24ab458258241d34d3f1a3d331e3a68 Mon Sep 17 00:00:00 2001 From: Nick Robinson Date: Wed, 25 May 2022 16:37:02 +0100 Subject: [PATCH] Update reference tests to latest v1.7 release (#349) * Update reference tests to latest v1.7 release * Add comment about keeping branch protection rules up-to-date --- .github/workflows/CI.yml | 8 ++++++-- test/fixtures/AllPlugins/docs/Manifest.toml | 2 +- .../DocumenterGitHubActions/docs/Manifest.toml | 2 +- test/fixtures/DocumenterGitLabCI/docs/Manifest.toml | 2 +- test/fixtures/DocumenterTravis/docs/Manifest.toml | 2 +- test/fixtures/WackyOptions/docs/Manifest.toml | 2 +- test/fixtures/WackyOptions/test/Manifest.toml | 2 +- test/runtests.jl | 10 ++++++---- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 33f0115a..f0595775 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -36,9 +36,13 @@ jobs: - os: windows-latest arch: x86 include: - # Add 1.7.1 to run the reference tests + # Add specific version used to run the reference tests. + # Must be kept in sync with version check in `test/runtests.jl`, + # and with the branch protection rules on the repository which + # require this specific job to pass on all PRs + # (see Settings > Branches > Branch protection rules). - os: ubuntu-latest - version: 1.7.1 + version: 1.7.2 arch: x64 steps: - uses: actions/checkout@v2 diff --git a/test/fixtures/AllPlugins/docs/Manifest.toml b/test/fixtures/AllPlugins/docs/Manifest.toml index 7a63bf23..464214e1 100644 --- a/test/fixtures/AllPlugins/docs/Manifest.toml +++ b/test/fixtures/AllPlugins/docs/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.AllPlugins]] diff --git a/test/fixtures/DocumenterGitHubActions/docs/Manifest.toml b/test/fixtures/DocumenterGitHubActions/docs/Manifest.toml index d7ad9b76..b16c489e 100644 --- a/test/fixtures/DocumenterGitHubActions/docs/Manifest.toml +++ b/test/fixtures/DocumenterGitHubActions/docs/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.ArgTools]] diff --git a/test/fixtures/DocumenterGitLabCI/docs/Manifest.toml b/test/fixtures/DocumenterGitLabCI/docs/Manifest.toml index 2a044a0f..4c9b6d9a 100644 --- a/test/fixtures/DocumenterGitLabCI/docs/Manifest.toml +++ b/test/fixtures/DocumenterGitLabCI/docs/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.ArgTools]] diff --git a/test/fixtures/DocumenterTravis/docs/Manifest.toml b/test/fixtures/DocumenterTravis/docs/Manifest.toml index b8a9d965..70147d15 100644 --- a/test/fixtures/DocumenterTravis/docs/Manifest.toml +++ b/test/fixtures/DocumenterTravis/docs/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.ArgTools]] diff --git a/test/fixtures/WackyOptions/docs/Manifest.toml b/test/fixtures/WackyOptions/docs/Manifest.toml index e9d524d8..bd100ee1 100644 --- a/test/fixtures/WackyOptions/docs/Manifest.toml +++ b/test/fixtures/WackyOptions/docs/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.ArgTools]] diff --git a/test/fixtures/WackyOptions/test/Manifest.toml b/test/fixtures/WackyOptions/test/Manifest.toml index e07c83f5..189c0f39 100644 --- a/test/fixtures/WackyOptions/test/Manifest.toml +++ b/test/fixtures/WackyOptions/test/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.Base64]] diff --git a/test/runtests.jl b/test/runtests.jl index e44a2af2..372b964e 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -31,7 +31,7 @@ function with_pkg(f::Function, t::Template, pkg::AbstractString=pkgname()) patch = @patch uuid4() = UUID("c51a4d33-e9a4-4efb-a257-e0de888ecc28") @suppress apply(patch) do t(pkg) - end + end try f(pkg) finally @@ -101,8 +101,10 @@ mktempdir() do dir # Quite a bit of output depends on the Julia version, # and the test fixtures are made with Julia 1.7. - # TODO: Keep this on the latest stable Julia version. - if VERSION == v"1.7.1" + # TODO: Keep this on the latest stable Julia version, and update + # the version used by the corresponding CI job at the same time. + REFERENCE_VERSION = v"1.7.2" + if VERSION == REFERENCE_VERSION # Ideally we'd use `with_clean_gitconfig`, but it's way too slow. branch = LibGit2.getconfig( "init.defaultBranch", @@ -114,7 +116,7 @@ mktempdir() do dir "Skipping reference tests, init.defaultBranch is set" end else - @info "Skipping reference tests" VERSION + @info "Skipping reference tests (requiring $REFERENCE_VERSION)" VERSION end else @info "Git is not installed, skipping Git and reference tests"