From 2d5d09297a346b1993157f2391992249bfe0bce2 Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Thu, 31 Oct 2024 12:21:30 +0100 Subject: [PATCH] Temp try CI fix branch --- .github/workflows/BuildDeployDoc.yml | 2 +- .gitlab-ci.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/BuildDeployDoc.yml b/.github/workflows/BuildDeployDoc.yml index f177603..8ca0378 100644 --- a/.github/workflows/BuildDeployDoc.yml +++ b/.github/workflows/BuildDeployDoc.yml @@ -21,7 +21,7 @@ jobs: version: '1.10' - name: clone integration test tools run: | - git clone --depth 1 -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /tmp/integration_test_tools/ + git clone --depth 1 -b fix-install-dev-pkg https://github.com/AntonReinhard/QuantumElectrodynamics.jl.git /tmp/integration_test_tools/ - name: set dev dependencies run: | $(julia --project=. /tmp/integration_test_tools/.ci/integTestGen/src/get_project_name_version_path.jl) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aefd42..bf16e6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: stage: unit-test script: - apt update && apt install -y git - - git clone --depth 1 -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /tmp/integration_test_tools/ + - git clone --depth 1 -b fix-install-dev-pkg https://github.com/AntonReinhard/QuantumElectrodynamics.jl.git /tmp/integration_test_tools/ - $(julia --project=. /tmp/integration_test_tools/.ci/integTestGen/src/get_project_name_version_path.jl) - echo "CI_DEV_PKG_NAME -> $CI_DEV_PKG_NAME" - echo "CI_DEV_PKG_VERSION -> $CI_DEV_PKG_VERSION" @@ -72,7 +72,7 @@ generate_integration_tests: script: # extract package name - apt update && apt install -y git - - git clone --depth 1 -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /QEDjl + - git clone --depth 1 -b fix-install-dev-pkg https://github.com/AntonReinhard/QuantumElectrodynamics.jl.git /QEDjl - $(julia --project /QEDjl/.ci/integTestGen/src/get_project_name_version_path.jl) - echo "CI_DEV_PKG_NAME -> $CI_DEV_PKG_NAME" - echo "CI_DEV_PKG_VERSION -> $CI_DEV_PKG_VERSION" @@ -109,7 +109,7 @@ verify-unit-test-deps_julia1.10: stage: verify-unit-test-deps script: - apt update && apt install -y git - - git clone --depth 1 -b dev https://github.com/QEDjl-project/QuantumElectrodynamics.jl.git /QEDjl + - git clone --depth 1 -b fix-install-dev-pkg https://github.com/AntonReinhard/QuantumElectrodynamics.jl.git /QEDjl - > if [[ $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_REF_NAME == "dev" ]]; then # does not check for custom package URLs on the main and dev branch