From ba1fa1f61c53429edfb8577a54c3e8f05a6ab079 Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 11:05:02 +0200 Subject: [PATCH 1/4] Add Reexport Compat entry --- Project.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 0f1e526..f42a1fb 100644 --- a/Project.toml +++ b/Project.toml @@ -4,15 +4,16 @@ authors = ["Uwe Hernandez Acosta ", "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" From 05236c9c3c08160b989906b02da228d1bfcee11c Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 13:27:06 +0200 Subject: [PATCH 2/4] Fix docs so they're being pushed to gh-pages --- .github/workflows/BuildDelopyDoc.yml | 2 +- README.md | 8 ++++---- docs/make.jl | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/BuildDelopyDoc.yml b/.github/workflows/BuildDelopyDoc.yml index cccab70..9ea83d3 100644 --- a/.github/workflows/BuildDelopyDoc.yml +++ b/.github/workflows/BuildDelopyDoc.yml @@ -3,7 +3,7 @@ name: Build and Deploy Documentation on: push: branches: - - master + - main - dev tags: '*' pull_request: diff --git a/README.md b/README.md index c1a3ee3..24c3860 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/docs/make.jl b/docs/make.jl index a564a58..6874f78 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -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) From bc1a92e00a8b97f7d9cab30aa86ef1646667b9a0 Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 14:21:05 +0200 Subject: [PATCH 3/4] Fix Julia versions in CI and fix file name typo --- .github/workflows/{BuildDelopyDoc.yml => BuildDeployDoc.yml} | 2 +- .github/workflows/formatter.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{BuildDelopyDoc.yml => BuildDeployDoc.yml} (98%) diff --git a/.github/workflows/BuildDelopyDoc.yml b/.github/workflows/BuildDeployDoc.yml similarity index 98% rename from .github/workflows/BuildDelopyDoc.yml rename to .github/workflows/BuildDeployDoc.yml index 9ea83d3..477812b 100644 --- a/.github/workflows/BuildDelopyDoc.yml +++ b/.github/workflows/BuildDeployDoc.yml @@ -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"));' diff --git a/.github/workflows/formatter.yaml b/.github/workflows/formatter.yaml index 3a98451..c5e31e4 100644 --- a/.github/workflows/formatter.yaml +++ b/.github/workflows/formatter.yaml @@ -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 From ed2d220cfe393f13bd68d39cebff18bb56fabd3a Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 19:54:23 +0200 Subject: [PATCH 4/4] Fix stable docs badge link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 24c3860..857ec7e 100644 --- a/README.md +++ b/README.md @@ -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)