Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use "pre" instead of "nightly" for GitHub CI #475

Merged
merged 3 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PkgTemplates"
uuid = "14b8a8f1-9102-5b29-a752-f990bacb7fe1"
authors = ["Chris de Graaf", "Invenia Technical Computing Corporation"]
version = "0.7.50"
version = "0.7.51"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand Down
17 changes: 9 additions & 8 deletions src/plugins/ci.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

const ALLOWED_FAILURES = ["nightly"] # TODO: Update this list with new RCs.
const DEFAULT_CI_VERSIONS = map(format_version, [default_version(), VERSION, "nightly"])
const DEFAULT_CI_VERSIONS_NO_NIGHTLY = map(format_version, [default_version(), VERSION])
const DEFAULT_CI_VERSIONS_GITHUB = map(format_version, [default_version(), VERSION, "pre"])
const DEFAULT_CI_VERSIONS_NO_PRERELEASE = map(format_version, [default_version(), VERSION])
const EXTRA_VERSIONS_DOC = "- `extra_versions::Vector`: Extra Julia versions to test, as strings or `VersionNumber`s."

"""
Expand All @@ -22,7 +23,7 @@
x64=true,
x86=false,
coverage=true,
extra_versions=$DEFAULT_CI_VERSIONS,
extra_versions=$DEFAULT_CI_VERSIONS_GITHUB,
)

Integrates your packages with [GitHub Actions](https://github.com/features/actions).
Expand Down Expand Up @@ -53,7 +54,7 @@
x64::Bool = true
x86::Bool = false
coverage::Bool = true
extra_versions::Vector = DEFAULT_CI_VERSIONS
extra_versions::Vector = DEFAULT_CI_VERSIONS_GITHUB
end

source(p::GitHubActions) = p.file
Expand Down Expand Up @@ -153,7 +154,7 @@
if p.arm64
p.osx && push!(excludes, Dict("E_OS" => "osx", "E_ARCH" => "arm64"))
p.windows && push!(excludes, Dict("E_OS" => "windows", "E_ARCH" => "arm64"))
"nightly" in versions && push!(excludes, Dict("E_JULIA" => "nightly", "E_ARCH" => "arm64"))
"pre" in versions && push!(excludes, Dict("E_JULIA" => "pre", "E_ARCH" => "arm64"))

Check warning on line 157 in src/plugins/ci.jl

View check run for this annotation

Codecov / codecov/patch

src/plugins/ci.jl#L157

Added line #L157 was not covered by tests
end

return Dict(
Expand Down Expand Up @@ -283,7 +284,7 @@
GitLabCI(;
file="$(contractuser(default_file("gitlab-ci.yml")))",
coverage=true,
extra_versions=$DEFAULT_CI_VERSIONS_NO_NIGHTLY,
extra_versions=$DEFAULT_CI_VERSIONS_NO_PRERELEASE,
)

Integrates your packages with [GitLab CI](https://docs.gitlab.com/ce/ci).
Expand All @@ -304,7 +305,7 @@
file::String = default_file("gitlab-ci.yml")
coverage::Bool = true
# Nightly has no Docker image.
extra_versions::Vector = DEFAULT_CI_VERSIONS_NO_NIGHTLY
extra_versions::Vector = DEFAULT_CI_VERSIONS_NO_PRERELEASE
end

gitignore(p::GitLabCI) = p.coverage ? COVERAGE_GITIGNORE : String[]
Expand Down Expand Up @@ -344,7 +345,7 @@
amd64=true,
arm=false,
arm64=false,
extra_versions=$DEFAULT_CI_VERSIONS_NO_NIGHTLY,
extra_versions=$DEFAULT_CI_VERSIONS_NO_PRERELEASE,
)

Integrates your packages with [Drone CI](https://drone.io).
Expand All @@ -367,7 +368,7 @@
amd64::Bool = true
arm::Bool = false
arm64::Bool = false
extra_versions::Vector = DEFAULT_CI_VERSIONS_NO_NIGHTLY
extra_versions::Vector = DEFAULT_CI_VERSIONS_NO_PRERELEASE
end

source(p::DroneCI) = p.file
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/AllPlugins/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version:
- '1.10'
- '1.6'
- 'nightly'
- 'pre'
os:
- ubuntu-latest
arch:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/Basic/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version:
- '1.10'
- '1.6'
- 'nightly'
- 'pre'
os:
- ubuntu-latest
arch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version:
- '1.10'
- '1.6'
- 'nightly'
- 'pre'
os:
- ubuntu-latest
arch:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/DocumenterGitLabCI/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version:
- '1.10'
- '1.6'
- 'nightly'
- 'pre'
os:
- ubuntu-latest
arch:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/DocumenterTravis/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version:
- '1.10'
- '1.6'
- 'nightly'
- 'pre'
os:
- ubuntu-latest
arch:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/WackyOptions/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- '1.10'
- '1.2'
- '1.6'
- 'nightly'
- 'pre'
os:
arch:
- x64
Expand Down
2 changes: 1 addition & 1 deletion test/show.jl
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ end
x64: true
x86: false
coverage: true
extra_versions: [\"1.6\", \"$(VERSION.major).$(VERSION.minor)\", \"nightly\"]
extra_versions: [\"1.6\", \"$(VERSION.major).$(VERSION.minor)\", \"pre\"]
License:
path: "$(joinpath(LICENSES_DIR, "MIT"))"
destination: "LICENSE"
Expand Down
Loading