Skip to content

Commit

Permalink
Backport all the hotfixes to dev (#54)
Browse files Browse the repository at this point in the history
The same hotfixes as were made to `main`. After this, `main` and `dev`
will have a common base at `v0.1.0`.
  • Loading branch information
AntonReinhard authored Sep 3, 2024
2 parents 31dfbaa + ed2d220 commit bbd699b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and Deploy Documentation
on:
push:
branches:
- master
- main
- dev
tags: '*'
pull_request:
Expand All @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: '1.9'
version: "1.10"
- name: Add custom registry
run: |
julia --project=docs/ -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry.git"));'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: install Julia
uses: julia-actions/setup-julia@v1
with:
version: 1.9
version: "1.10"
- name: Install Julia requirements
run: julia --project=${GITHUB_WORKSPACE}/.formatting -e 'import Pkg; Pkg.instantiate()'
- name: Check code style
Expand Down
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ authors = ["Uwe Hernandez Acosta <[email protected]>", "Simeon Ehrig", "Klaus
version = "0.1.0"

[deps]
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
QEDbase = "10e22c08-3ccb-4172-bfcf-7d7aa3d04d93"
QEDcore = "35dc0263-cb5f-4c33-a114-1d7f54ab753e"
QEDevents = "fc3ce04a-5be5-4f3a-acff-eceaab723759"
QEDfields = "ac3a6c97-e859-4b9f-96bb-63d2a216042c"
QEDprocesses = "46de9c38-1bb3-4547-a1ec-da24d767fdad"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
julia = "1.6"
Reexport = "^1.2"
QEDbase = "0.2.2"
QEDcore = "0.1"
QEDevents = "0.1"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# QED

[![Doc Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://qedjl-project.github.io/QED.jl/main)
[![Doc Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://qedjl-project.github.io/QED.jl/stable)
[![Doc Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://qedjl-project.github.io/QED.jl/dev)
[![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)

Expand All @@ -23,15 +23,15 @@ or you use the Pkg prompt by hitting `]` within the Julia REPL and then type

```julia
# add local registry, where QED is registered
(@v1.9) pkg> registry add https://github.com/QEDjl-project/registry
(@v1.10) pkg> registry add https://github.com/QEDjl-project/registry
# add general registry again to have it join the local registry
(@v1.9) pkg> registry add https://github.com/JuliaRegistries/General
(@v1.10) pkg> registry add https://github.com/JuliaRegistries/General

(@v1.9) pkg> add QED
(@v1.10) pkg> add QED
```

To install the locally downloaded package on Windows, change to the parent directory and type within the Pkg prompt

```julia
(@v1.9) pkg> add ./QED.jl
(@v1.10) pkg> add ./QED.jl
```
4 changes: 1 addition & 3 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ makedocs(;
pages=["Home" => "index.md", "Automatic Testing" => "ci.md"],
)

deploydocs(;
repo="github.com/QEDjl-project/QED.jl.git", push_preview=false, devbranch="main"
)
deploydocs(; repo="github.com/QEDjl-project/QED.jl.git", push_preview=false)

0 comments on commit bbd699b

Please sign in to comment.