From d637ab9708b25fe0e8710d5dcc9eb1d76db91fcf Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 14:14:15 +0200 Subject: [PATCH 1/3] Fix branch names and julia version number in CI --- .github/workflows/BuildDeployDoc.yml | 2 +- .github/workflows/formatter.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildDeployDoc.yml b/.github/workflows/BuildDeployDoc.yml index 6ff1d30..a011b23 100644 --- a/.github/workflows/BuildDeployDoc.yml +++ b/.github/workflows/BuildDeployDoc.yml @@ -3,7 +3,7 @@ name: Build and Deploy Documentation on: push: branches: - - master + - main - dev tags: "*" pull_request: diff --git a/.github/workflows/formatter.yaml b/.github/workflows/formatter.yaml index 5cbe730..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.10 + version: "1.10" - name: Install Julia requirements run: julia --project=${GITHUB_WORKSPACE}/.formatting -e 'import Pkg; Pkg.instantiate()' - name: Check code style From 04b1f8b261691017611f7f650ba931bf6b525c83 Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 14:33:06 +0200 Subject: [PATCH 2/3] Fix CI script indentation --- .github/workflows/BuildDeployDoc.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/BuildDeployDoc.yml b/.github/workflows/BuildDeployDoc.yml index a011b23..3281091 100644 --- a/.github/workflows/BuildDeployDoc.yml +++ b/.github/workflows/BuildDeployDoc.yml @@ -24,13 +24,12 @@ jobs: julia --project=docs/ -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry.git"));' julia --project=docs/ -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/JuliaRegistries/General"));' - name: Install dependencies - run: | - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' + run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - name: set dependencies to dev branch version - if: (github.event_name == 'push' && github.ref_name != 'main') || (github.event_name == 'pull_request' && github.base_ref != 'main') - run: | - git clone -b dev https://github.com/QEDjl-project/QED.jl.git /tmp/integration_test_tools - julia --project=docs/ /tmp/integration_test_tools/.ci/set_dev_dependencies.jl + if: (github.event_name == 'push' && github.ref_name != 'main') || (github.event_name == 'pull_request' && github.base_ref != 'main') + run: | + git clone -b dev https://github.com/QEDjl-project/QED.jl.git /tmp/integration_test_tools + julia --project=docs/ /tmp/integration_test_tools/.ci/set_dev_dependencies.jl - name: Build and deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token From 2872c481e08267b2df7f347da5535768f4505c2f Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Mon, 2 Sep 2024 19:50:50 +0200 Subject: [PATCH 3/3] Fix docs link for stable version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2592c13..75be1c5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # QEDevents -[![Doc Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://qedjl-project.github.io/QEDevents.jl/main) +[![Doc Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://qedjl-project.github.io/QEDevents.jl/stable) [![Doc Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://qedjl-project.github.io/QEDevents.jl/dev) [![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)