diff --git a/.ci/integTestGen/src/integTestGen.jl b/.ci/integTestGen/src/integTestGen.jl index 4b6cf93..b801802 100644 --- a/.ci/integTestGen/src/integTestGen.jl +++ b/.ci/integTestGen/src/integTestGen.jl @@ -254,14 +254,6 @@ function generate_job_yaml!( push!(script, "git checkout $(split_url[2])") end - push!( - script, - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/QEDjl-project/registry.git\"));'", - ) - push!( - script, - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/JuliaRegistries/General\"));'", - ) push!( script, "julia --project=. -e 'import Pkg; Pkg.develop(path=\"$ci_project_dir\");'" ) diff --git a/.ci/integTestGen/test/generate_job_yaml.jl b/.ci/integTestGen/test/generate_job_yaml.jl index 2232095..d3f0528 100644 --- a/.ci/integTestGen/test/generate_job_yaml.jl +++ b/.ci/integTestGen/test/generate_job_yaml.jl @@ -38,8 +38,6 @@ end "cd /", "git clone -b main $(package_infos["QEDcore"].url) integration_test", "cd integration_test", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/QEDjl-project/registry.git\"));'", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/JuliaRegistries/General\"));'", "julia --project=. -e 'import Pkg; Pkg.develop(path=\"/path/to/QEDcore.jl\");'", "julia --project=. -e 'import Pkg; Pkg.test(; coverage = true)'", ], @@ -83,8 +81,6 @@ end "git clone -b feature3 $(package_infos["QEDcore"].url) integration_test", "git clone -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /integration_test_tools", "cd integration_test", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/QEDjl-project/registry.git\"));'", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/JuliaRegistries/General\"));'", "julia --project=. -e 'import Pkg; Pkg.develop(path=\"/path/to/QEDcore.jl\");'", "julia --project=. /integration_test_tools/.ci/set_dev_dependencies.jl", "julia --project=. -e 'import Pkg; Pkg.test(; coverage = true)'", @@ -132,8 +128,6 @@ end "git clone -b dev $(package_infos["QEDcore"].url) integration_test", "git clone -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /integration_test_tools", "cd integration_test", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/QEDjl-project/registry.git\"));'", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/JuliaRegistries/General\"));'", "julia --project=. -e 'import Pkg; Pkg.develop(path=\"/path/to/QEDcore.jl\");'", "julia --project=. /integration_test_tools/.ci/set_dev_dependencies.jl", "julia --project=. -e 'import Pkg; Pkg.test(; coverage = true)'", @@ -169,8 +163,6 @@ end "cd /", "git clone -b main $(package_infos["QEDcore"].url) integration_test", "cd integration_test", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/QEDjl-project/registry.git\"));'", - "julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url=\"https://github.com/JuliaRegistries/General\"));'", "julia --project=. -e 'import Pkg; Pkg.develop(path=\"/path/to/QEDcore.jl\");'", "julia --project=. -e 'import Pkg; Pkg.test(; coverage = true)'", ], diff --git a/.github/workflows/BuildDeployDoc.yml b/.github/workflows/BuildDeployDoc.yml index 8c8ed6b..cf1cb50 100644 --- a/.github/workflows/BuildDeployDoc.yml +++ b/.github/workflows/BuildDeployDoc.yml @@ -19,10 +19,6 @@ jobs: - uses: julia-actions/setup-julia@v1 with: 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"));' - 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()' - name: set dependencies to dev branch version diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index dfba262..7661405 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -27,12 +27,6 @@ jobs: ENV["JULIA_PKG_SERVER"] = "" Pkg.Registry.add("General") shell: julia --color=yes {0} - - name: "Add QED custom registry" - run: | - import Pkg - ENV["JULIA_PKG_SERVER"] = "" - Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry.git")) - shell: julia --color=yes {0} - name: "Install CompatHelper" run: | import Pkg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a24c3b3..809ba98 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,6 @@ stages: - julia --project=. -e 'import Pkg; Pkg.test(; coverage = true)' - cd ${CI_PROJECT_DIR} # test integTestGen - - julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry.git"));' - - julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/JuliaRegistries/General"));' - cd ${CI_PROJECT_DIR}/.ci/integTestGen - julia --project=. -e 'import Pkg; Pkg.instantiate()' - julia --project=. -e 'import Pkg; Pkg.test(; coverage = true)'