Skip to content

Commit

Permalink
Merge pull request #32 from lgoettgens/lg/bump-julia-1.10
Browse files Browse the repository at this point in the history
Bump default julia to 1.10
  • Loading branch information
benlorenz authored Jan 23, 2024
2 parents 868c08c + 161e829 commit 612bf3a
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/oscar-doctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: "Set up Julia"
uses: julia-actions/setup-julia@v1
with:
version: '~1.9.0-0'
version: '1.10'
- name: OscarDevTools - CI
if: github.repository == 'oscar-system/OscarDevTools.jl'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oscar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: "Set up Julia"
uses: julia-actions/setup-julia@v1
with:
version: '~1.9.0-0'
version: '1.10'
- name: OscarDevTools - CI
if: github.repository == 'oscar-system/OscarDevTools.jl'
run: |
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OscarDevTools"
uuid = "4f01c588-2833-446a-9dbd-6331d80acb41"
authors = ["Benjamin Lorenz <[email protected]>"]
version = "0.2.14"
version = "0.2.15"

[deps]
GitHub = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
Expand Down
27 changes: 16 additions & 11 deletions src/defaults.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
### defaults for julia-version, os and branches

const default_os = [ "ubuntu-latest" ]
const default_julia = [ "~1.6.0-0", "~1.9.0-0" ]
const default_julia = [ "~1.6.0-0", "~1.10.0-0" ]
const default_branches = [ "<matching>", "release" ]

# for each package this contains an ordered list with
Expand All @@ -11,16 +11,21 @@ const default_branches = [ "<matching>", "release" ]
# newest entries should come first
# if no matching version is found the doctests will run with julia 1.6
const doctest_versions = Dict(
:Oscar => [v"0.13.0-DEV" => (v"1.9", v"1.12"),
v"0.12.1-DEV" => (v"1.8", v"1.11")],
:Hecke => [v"0.19.5" => (v"1.9", v"1.10" ),
v"0.16.7" => (v"1.8", v"1.9" )],
:AbstractAlgebra => [v"0.31.0" => (v"1.9", v"1.10"),
v"0.29.5" => (v"1.8", v"1.9" )],
:Nemo => [v"0.35.1" => (v"1.9", v"1.10" ),
v"0.33.8" => (v"1.8", v"1.9" )],
:Singular => [v"0.18.8" => (v"1.9", v"1.10" ),
v"0.18.3" => (v"1.8", v"1.9" )],
:Oscar => [v"0.14.0-DEV" => (v"1.10", v"1.12"),
v"0.13.0-DEV" => (v"1.9" , v"1.11"),
v"0.12.1-DEV" => (v"1.8" , v"1.11")],
:Hecke => [v"0.24.1" => (v"1.10", v"1.11"),
v"0.19.5" => (v"1.9" , v"1.10"),
v"0.16.7" => (v"1.8" , v"1.9" )],
:AbstractAlgebra => [v"0.35.3" => (v"1.10", v"1.11"),
v"0.31.0" => (v"1.9" , v"1.10"),
v"0.29.5" => (v"1.8" , v"1.9" )],
:Nemo => [v"0.40.0" => (v"1.10", v"1.11"),
v"0.35.1" => (v"1.9" , v"1.10"),
v"0.33.8" => (v"1.8" , v"1.9" )],
:Singular => [v"0.21.3" => (v"1.10", v"1.11"),
v"0.18.8" => (v"1.9" , v"1.10"),
v"0.18.3" => (v"1.8" , v"1.9" )],
)

### end defaults
Expand Down
4 changes: 2 additions & 2 deletions test/meta/OscarCI-doctest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title = "metadata for oscar CI run"
# the pull request and use master if that cannot be found
[env]
# os = [ "ubuntu-latest" ]
# julia-version = [ "~1.9.0-0" ]
# julia-version = [ "~1.10.0-0" ]
# branches = [ "<matching>", "release" ]

# pkgs without branches specified will use the global branches axis
Expand All @@ -29,5 +29,5 @@ title = "metadata for oscar CI run"
[include.macos]
Singular = "<matching>"
os = "macos-latest"
julia-version = "~1.9.0-0"
julia-version = "~1.10.0-0"

2 changes: 1 addition & 1 deletion test/meta/OscarCI-julia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "metadata for oscar CI run"
# keep it small to prevent job-explosion
[env]
os = [ "ubuntu-latest" ]
julia-version = [ "~1.6.0-0", "~1.9.0-0", "nightly" ]
julia-version = [ "~1.6.0-0", "~1.10.0-0", "nightly" ]

# for OscarDevTools we mostly use release versions
[pkgs]
Expand Down
4 changes: 2 additions & 2 deletions test/meta/OscarCI.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title = "metadata for oscar CI run"
# the pull request and use master if that cannot be found
[env]
# os = [ "ubuntu-latest" ]
# julia-version = [ "~1.9.0-0" ]
# julia-version = [ "~1.10.0-0" ]
# branches = [ "<matching>", "release" ]

# pkgs without branches specified will use the global branches axis
Expand All @@ -29,5 +29,5 @@ title = "metadata for oscar CI run"
[include.macos]
Singular = "<matching>"
os = "macos-latest"
julia-version = "~1.9.0-0"
julia-version = "~1.10.0-0"

2 comments on commit 612bf3a

@benlorenz
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/99369

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.15 -m "<description of version>" 612bf3ad602edc3a62c61a37fe5eca505fac43df
git push origin v0.2.15

Please sign in to comment.