From b75d58abf7917072dd33c933a0f6472b8cf1a35c Mon Sep 17 00:00:00 2001 From: Simeon Ehrig Date: Fri, 13 Sep 2024 16:57:23 +0200 Subject: [PATCH] remove custom registry in CI --- .github/workflows/BuildDeployDoc.yml | 4 ---- .github/workflows/CompatHelper.yml | 6 ------ .gitlab-ci.yml | 6 ------ 3 files changed, 16 deletions(-) diff --git a/.github/workflows/BuildDeployDoc.yml b/.github/workflows/BuildDeployDoc.yml index e2f5d85..aabe35c 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 a59021c..5d1669e 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 QEDjl-project 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 a2883dc..759e128 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,6 @@ stages: script: - apt update && apt install -y git - git clone --depth 1 -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /QEDjl - - 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"));' - > if [[ $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_REF_NAME == "dev" ]]; then # set name of the commit message from CI_COMMIT_MESSAGE to NO_MESSAGE, that the script does not read accidentally custom packages from the commit message of a merge commit @@ -72,10 +70,6 @@ generate_integration_tests: - apt update && apt install -y git - git clone --depth 1 -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /QEDjl - cd /QEDjl/.ci/integTestGen/ - # use local registry of the QED project - - julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry.git"));' - # needs to add General registry again, if local registry was added - - julia --project=. -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/JuliaRegistries/General"));' - julia --project=. -e 'import Pkg; Pkg.instantiate()' # paths of artifacts are relative to CI_PROJECT_DIR - >