From 18c4c73aa6ada1aa1ba266ea855f6281505ebc0f Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Tue, 16 Apr 2024 11:37:21 +0100 Subject: [PATCH 01/18] update reframe.config nodelist --- benchmarks/reframe_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/benchmarks/reframe_config.py b/benchmarks/reframe_config.py index d486b2a2..51ed11b0 100644 --- a/benchmarks/reframe_config.py +++ b/benchmarks/reframe_config.py @@ -712,8 +712,9 @@ def spack_root_to_path(): '%(check_job_completion_time)s|' 'reframe %(version)s|' '%(check_info)s|' - '%(check_jobid)s|' + '%(check_jobid)s|' '%(check_num_tasks)s|' + '%(check_job_nodelist)s|' '%(check_num_cpus_per_task)s|' '%(check_num_tasks_per_node)s|' '%(check_num_gpus_per_node)s|' From 4fe0228b23284c3dfecfc536bf3a44b417b17ffe Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Tue, 16 Apr 2024 13:18:34 +0100 Subject: [PATCH 02/18] undo changes for nodelist --- benchmarks/reframe_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/benchmarks/reframe_config.py b/benchmarks/reframe_config.py index 32bbe65b..3cb2c668 100644 --- a/benchmarks/reframe_config.py +++ b/benchmarks/reframe_config.py @@ -769,7 +769,6 @@ def spack_root_to_path(): '%(check_info)s|' '%(check_jobid)s|' '%(check_num_tasks)s|' - '%(check_job_nodelist)s|' '%(check_num_cpus_per_task)s|' '%(check_num_tasks_per_node)s|' '%(check_num_gpus_per_node)s|' From b73029e774d84b3741ae3e1e3e55ffe1cc612fbe Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Mon, 22 Apr 2024 15:14:45 +0100 Subject: [PATCH 03/18] fixed typo --- docs/systems.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/systems.md b/docs/systems.md index 3a6dd91a..ea036bba 100644 --- a/docs/systems.md +++ b/docs/systems.md @@ -65,13 +65,13 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example: ``` -reframe -c benchmarks/examples/sombrero -r --performance-report --system csd3-skylake:compute-node -J'--accout=' +reframe -c benchmarks/examples/sombrero -r --performance-report --system csd3-skylake:compute-node -J'--account=' ``` where `` is the project you want to charge. You can see the account balance of your projects with the `mybalance` command. -## Cosma +## Cosma8 ### Queue options @@ -79,7 +79,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example: ``` -reframe -c benchmarks/examples/sombrero -r --performance-report --system cosma8:compute-node -J'--accout=' +reframe -c benchmarks/examples/sombrero -r --performance-report --system cosma8:compute-node -J'--account=' ``` where `` is the project you want to charge. DiRAC users can find the account codes @@ -93,7 +93,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example: ``` -reframe -c benchmarks/examples/sombrero -r --performance-report --system dial2:compute-node -J'--accout=' +reframe -c benchmarks/examples/sombrero -r --performance-report --system dial2:compute-node -J'--account=' ``` where `` is the project you want to charge. @@ -108,7 +108,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example: ``` -reframe -c benchmarks/examples/sombrero -r --performance-report --system dial3:compute-node -J'--accout=' +reframe -c benchmarks/examples/sombrero -r --performance-report --system dial3:compute-node -J'--account=' ``` where `` is the project you want to charge. @@ -165,7 +165,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example: ``` -reframe -c benchmarks/examples/sombrero -r --performance-report --system tursa:compute-node -J'--accout=' +reframe -c benchmarks/examples/sombrero -r --performance-report --system tursa:compute-node -J'--account=' ``` where `` is the project you want to charge. From bcee433704d168ce855e25614b8fa62ab66ff60b Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Thu, 25 Apr 2024 16:04:33 +0100 Subject: [PATCH 04/18] Spack: add new compilers for cosma8 environment --- .../spack/cosma8/compute-node/spack.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/benchmarks/spack/cosma8/compute-node/spack.yaml b/benchmarks/spack/cosma8/compute-node/spack.yaml index 72a24356..4091e5b4 100644 --- a/benchmarks/spack/cosma8/compute-node/spack.yaml +++ b/benchmarks/spack/cosma8/compute-node/spack.yaml @@ -138,6 +138,38 @@ spack: modules: [] environment: {} extra_rpaths: [] + - compiler: + spec: aocc@3.1.0 + paths: + cc: /cosma/local/aocc/aocc-compiler-3.1.0/bin/clang + cxx: /cosma/local/aocc/aocc-compiler-3.1.0/bin/clang++ + f77: /cosma/local/aocc/aocc-compiler-3.1.0/bin/flang + fc: /cosma/local/aocc/aocc-compiler-3.1.0/bin/flang + flags: + cflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false + cxxflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false + fflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false + operating_system: centos7 + target: x86_64 + modules: [] + environment: {} + extra_rpaths: [] + - compiler: + spec: aocc@4.0.0 + paths: + cc: /cosma/local/aocc/aocc-compiler-4.0.0/bin/clang + cxx: /cosma/local/aocc/aocc-compiler-4.0.0/bin/clang++ + f77: /cosma/local/aocc/aocc-compiler-4.0.0/bin/flang + fc: /cosma/local/aocc/aocc-compiler-4.0.0/bin/flang + flags: + cflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false + cxxflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false + fflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false + operating_system: centos7 + target: x86_64 + modules: [] + environment: {} + extra_rpaths: [] - compiler: spec: gcc@7.3.0 paths: @@ -216,6 +248,19 @@ spack: modules: [] environment: {} extra_rpaths: [] + - compiler: + spec: gcc@13.1.0 + paths: + cc: /cosma/local/gcc/13.1.0/bin/gcc + cxx: /cosma/local/gcc/13.1.0/bin/g++ + f77: /cosma/local/gcc/13.1.0/bin/gfortran + fc: /cosma/local/gcc/13.1.0/bin/gfortran + flags: {} + operating_system: centos7 + target: x86_64 + modules: [] + environment: {} + extra_rpaths: [] - compiler: spec: intel@17.0.2 paths: @@ -434,6 +479,19 @@ spack: modules: [] environment: {} extra_rpaths: [] + - compiler: + spec: dpcpp@2023.2.0 + paths: + cc: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/icx + cxx: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/dpcpp + f77: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/ifx + fc: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/ifx + flags: {} + operating_system: centos7 + target: x86_64 + modules: [] + environment: {} + extra_rpaths: [] packages: autoconf: externals: From f004af6300bdf841d50cd5ce96bb0bf2e6ec66e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Thu, 25 Apr 2024 16:42:04 +0100 Subject: [PATCH 05/18] Debug --- .github/workflows/docs.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fdb6d4ab..4f490cbc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -56,6 +56,8 @@ jobs: run: pip install mkdocs-material github3.py - name: Checkout gh-pages + # Run only if push is to `main`, or if it's a PR not from a fork. + if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork) }} uses: actions/checkout@v4 with: ref: gh-pages @@ -80,11 +82,11 @@ jobs: - name: Build docs run: | - if [[ ${{ github.event_name }} == 'pull_request' ]]; then + if [[ ${{ github.event_name }} == 'pull_request' ]] || [[ "${{ github.event.pull_request.head.repo.fork }}" == "false" ]] ; then export MKDOCS_SITE_DIR="site/${PREVIEW_SUBDIR}" export MKDOCS_SITE_URL="${BASE_URL}/${PREVIEW_SUBDIR}" fi - mkdocs build + mkdocs --verbose build - name: Deploy docs # Run only if push is to `main`, or if it's a PR not from a fork. From 3fcc2eed3f4d1f8deb25c72c94b07fa1402d70b7 Mon Sep 17 00:00:00 2001 From: Gokmen Kilic Date: Thu, 2 May 2024 16:13:24 +0100 Subject: [PATCH 06/18] Update benchmarks/spack/cosma8/compute-node/spack.yaml Co-authored-by: Tuomas Koskela --- benchmarks/spack/cosma8/compute-node/spack.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/benchmarks/spack/cosma8/compute-node/spack.yaml b/benchmarks/spack/cosma8/compute-node/spack.yaml index 4091e5b4..17c7282e 100644 --- a/benchmarks/spack/cosma8/compute-node/spack.yaml +++ b/benchmarks/spack/cosma8/compute-node/spack.yaml @@ -479,19 +479,6 @@ spack: modules: [] environment: {} extra_rpaths: [] - - compiler: - spec: dpcpp@2023.2.0 - paths: - cc: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/icx - cxx: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/dpcpp - f77: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/ifx - fc: /cosma/local/intel/oneAPI_2023.2.0/compiler/2023.2.0/linux/bin/ifx - flags: {} - operating_system: centos7 - target: x86_64 - modules: [] - environment: {} - extra_rpaths: [] packages: autoconf: externals: From 1c15183d0c118d3b5e66bce7c3e0ee035aca1d55 Mon Sep 17 00:00:00 2001 From: Gokmen Kilic Date: Thu, 2 May 2024 16:13:59 +0100 Subject: [PATCH 07/18] Update benchmarks/reframe_config.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- benchmarks/reframe_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/reframe_config.py b/benchmarks/reframe_config.py index 3cb2c668..1e97e4c6 100644 --- a/benchmarks/reframe_config.py +++ b/benchmarks/reframe_config.py @@ -767,7 +767,7 @@ def spack_root_to_path(): '%(check_job_completion_time)s|' 'reframe %(version)s|' '%(check_info)s|' - '%(check_jobid)s|' + '%(check_jobid)s|' '%(check_num_tasks)s|' '%(check_num_cpus_per_task)s|' '%(check_num_tasks_per_node)s|' From 3a62b2a0d3a60333338ff710b9079e6bc41d1940 Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Wed, 15 May 2024 16:24:29 +0100 Subject: [PATCH 08/18] Update Cosma8 reference value of GridBenchmark --- benchmarks/apps/grid/grid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/apps/grid/grid.py b/benchmarks/apps/grid/grid.py index 430deba0..071ab59c 100644 --- a/benchmarks/apps/grid/grid.py +++ b/benchmarks/apps/grid/grid.py @@ -36,7 +36,7 @@ class GridBenchmark_ITT(GridBenchmark): reference = { 'cosma8': { - 'Performance': (425000, None, None, 'Mflop/s per node') + 'Performance': (625000, None, None, 'Mflop/s per node') }, 'csd3-centos7:cascadelake': { 'Performance': (350000, None, None, 'Mflop/s per node') From 97f30a5dc1108b622558bc00684e7c5740b5e6af Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Wed, 15 May 2024 16:24:58 +0100 Subject: [PATCH 09/18] Update Cosma8 reference value of SwiftBenchmark --- benchmarks/apps/swift/swift.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/apps/swift/swift.py b/benchmarks/apps/swift/swift.py index a4002e7f..b2c3ce76 100644 --- a/benchmarks/apps/swift/swift.py +++ b/benchmarks/apps/swift/swift.py @@ -21,7 +21,7 @@ class SwiftBenchmark(SpackTest): time_limit = '20m' reference = { 'cosma8': { - 'duration': (50, None, 0.2, 'seconds'), + 'duration': (40, None, 0.2, 'seconds'), }, 'csd3-centos7:cascadelake': { 'duration': (37, None, 0.2, 'seconds'), From 2f3d16c31ea4098637c2f395959e6be18601f2f6 Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Wed, 15 May 2024 16:25:54 +0100 Subject: [PATCH 10/18] Update Cosma8 reference value of SombreroBenchmark --- benchmarks/examples/sombrero/sombrero.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/examples/sombrero/sombrero.py b/benchmarks/examples/sombrero/sombrero.py index aa15e40e..54a01f2e 100644 --- a/benchmarks/examples/sombrero/sombrero.py +++ b/benchmarks/examples/sombrero/sombrero.py @@ -67,7 +67,7 @@ class SombreroBenchmark(SpackTest): 'flops': (1.2, None, None, 'Gflops/seconds'), }, 'cosma8': { - 'flops': (3.8, -0.2, None, 'Gflops/seconds'), + 'flops': (8.0, -0.2, None, 'Gflops/seconds'), }, 'csd3-centos7:cascadelake': { 'flops': (8.0, -0.2, None, 'Gflops/seconds'), From 671fd486057c919deedd64a315483d876d08a74b Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Wed, 15 May 2024 16:41:20 +0100 Subject: [PATCH 11/18] Reframe: Add nodelist info for perflog --- benchmarks/reframe_config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/benchmarks/reframe_config.py b/benchmarks/reframe_config.py index 1e97e4c6..6ebadada 100644 --- a/benchmarks/reframe_config.py +++ b/benchmarks/reframe_config.py @@ -768,6 +768,7 @@ def spack_root_to_path(): 'reframe %(version)s|' '%(check_info)s|' '%(check_jobid)s|' + '%(check_job_nodelist)s|' '%(check_num_tasks)s|' '%(check_num_cpus_per_task)s|' '%(check_num_tasks_per_node)s|' From 42ffe57ef0959558cf7204b29d8b08e3f42ce20e Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Thu, 16 May 2024 12:10:28 +0100 Subject: [PATCH 12/18] Update packages to cosma8 Spack environment --- benchmarks/spack/cosma8/compute-node/spack.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/benchmarks/spack/cosma8/compute-node/spack.yaml b/benchmarks/spack/cosma8/compute-node/spack.yaml index 17c7282e..2355e5f9 100644 --- a/benchmarks/spack/cosma8/compute-node/spack.yaml +++ b/benchmarks/spack/cosma8/compute-node/spack.yaml @@ -484,6 +484,8 @@ spack: externals: - spec: autoconf@2.69 prefix: /usr + - spec: autoconf@2.71 + prefix: /cosma/local/autoconf/2.71/ automake: externals: - spec: automake@1.13.4 @@ -492,6 +494,8 @@ spack: externals: - spec: bash@4.2.46 prefix: /usr + - spec: bash@5.2.21 + prefix: /cosma/local/bash/5.2.21/ boost: externals: - spec: boost@1.67.0%gcc@10.2.0 arch=linux-centos7-zen2 @@ -508,14 +512,22 @@ spack: prefix: /cosma/local/cmake/3.11.4/ - spec: cmake@3.18.1 prefix: /cosma/local/cmake/3.18.1/ + - spec: cmake@3.25.1 + prefix: /cosma/local/cmake/3.25.1/ + - spec: cmake@3.28.3. + prefix: /cosma/local/cmake/3.28.3/ cpio: externals: - spec: cpio@2.11 prefix: /usr cuda: externals: - - spec: cuda@10.1.243 + - spec: cuda@10.1 prefix: /cosma/local/cuda/10.1 + - spec: cuda@11.0 + prefix: /cosma/local/cuda/11.2 + - spec: cuda@11.2 + prefix: /cosma/local/cuda/11.2 diffutils: externals: - spec: diffutils@3.3 From 3cfd38e55d0b0b3ad21a8bfe3c6823a78db8ee82 Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Thu, 16 May 2024 12:24:25 +0100 Subject: [PATCH 13/18] Update packages for cosma8 Spack environment --- benchmarks/spack/cosma8/compute-node/spack.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/benchmarks/spack/cosma8/compute-node/spack.yaml b/benchmarks/spack/cosma8/compute-node/spack.yaml index 2355e5f9..988964fa 100644 --- a/benchmarks/spack/cosma8/compute-node/spack.yaml +++ b/benchmarks/spack/cosma8/compute-node/spack.yaml @@ -634,7 +634,7 @@ spack: prefix: /usr libtool: externals: - - spec: libtool@2.4 + - spec: libtool@2.4.2 prefix: /usr lustre: externals: @@ -686,7 +686,7 @@ spack: - spec: openmpi@4.0.5~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%aocc@2.2.0 fabrics=ucx schedulers=slurm prefix: /cosma/local/openmpi/aocc_2.2.0/4.0.5 - - spec: openmpi@4.1.0a1~cuda~cxx~cxx_exceptions~java~memchecker+pmi~sqlite3~static~thread_multiple~wrapper-rpath%gcc@7.3.0 + - spec: openmpi@4.1.1~cuda~cxx~cxx_exceptions~java~memchecker+pmi~sqlite3~static~thread_multiple~wrapper-rpath%gcc@7.3.0 fabrics=ucx schedulers=slurm prefix: /cosma/local/openmpi/gnu_7.3.0/20190429 - spec: openmpi@4.1.1~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%gcc@9.3.0 @@ -695,6 +695,18 @@ spack: - spec: openmpi@4.1.1~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%gcc@11.1.0 schedulers=slurm prefix: /cosma/local/openmpi/gnu_11.1.0/4.1.1.no-ucx + - spec: openmpi@4.1.4~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%gcc@11.1.0 + schedulers=slurm + prefix: /cosma/local/openmpi/gnu_13.1.0/4.1.4 + - spec: openmpi@4.1.4~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%gcc@13.1.0 + schedulers=slurm + prefix: /cosma/local/openmpi/gnu_13.1.0/4.1.4 + - spec: openmpi@4.1.5~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%gcc@13.1.0 + schedulers=slurm + prefix: /cosma/local/openmpi/gnu_13.1.0/4.1.5 + - spec: openmpi@4.1.5~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%gcc@14.1.0 + schedulers=slurm + prefix: /cosma/local/openmpi/gnu_14.1.0/4.1.5 openssh: externals: - spec: openssh@7.4p1 From 05a680150d31ce39a0a8d5dff28e15cf30758fcd Mon Sep 17 00:00:00 2001 From: Gokmen Kilic Date: Tue, 21 May 2024 17:42:21 +0100 Subject: [PATCH 14/18] Update benchmarks/reframe_config.py already added node id Co-authored-by: Tuomas Koskela --- benchmarks/reframe_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/benchmarks/reframe_config.py b/benchmarks/reframe_config.py index 6ebadada..1e97e4c6 100644 --- a/benchmarks/reframe_config.py +++ b/benchmarks/reframe_config.py @@ -768,7 +768,6 @@ def spack_root_to_path(): 'reframe %(version)s|' '%(check_info)s|' '%(check_jobid)s|' - '%(check_job_nodelist)s|' '%(check_num_tasks)s|' '%(check_num_cpus_per_task)s|' '%(check_num_tasks_per_node)s|' From 76fe75208f68d5628829f1e6e7e5470b91bb6ea7 Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Tue, 21 May 2024 17:46:03 +0100 Subject: [PATCH 15/18] fixed typo --- benchmarks/spack/cosma8/compute-node/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/spack/cosma8/compute-node/spack.yaml b/benchmarks/spack/cosma8/compute-node/spack.yaml index b7d146d3..267f2c87 100644 --- a/benchmarks/spack/cosma8/compute-node/spack.yaml +++ b/benchmarks/spack/cosma8/compute-node/spack.yaml @@ -499,7 +499,7 @@ spack: - spec: cuda@10.1 prefix: /cosma/local/cuda/10.1 - spec: cuda@11.0 - prefix: /cosma/local/cuda/11.2 + prefix: /cosma/local/cuda/11.0 - spec: cuda@11.2 prefix: /cosma/local/cuda/11.2 diffutils: From ff23b118af8430590fb2cd502d231d18c668a46f Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Wed, 22 May 2024 16:17:25 +0100 Subject: [PATCH 16/18] removing the conflict --- .github/workflows/docs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 24f95c99..40f69ef8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -91,13 +91,10 @@ jobs: - name: Build docs run: | -<<<<<<< HEAD if [[ ${{ github.event_name }} == 'pull_request' ]] || [[ "${{ github.event.pull_request.head.repo.fork }}" == "false" ]] ; then export MKDOCS_SITE_DIR="site/${PREVIEW_SUBDIR}" export MKDOCS_SITE_URL="${BASE_URL}/${PREVIEW_SUBDIR}" fi -======= ->>>>>>> 1c15183d0c118d3b5e66bce7c3e0ee035aca1d55 mkdocs --verbose build - name: Deploy docs From 69c2403e2f1b55a8efe4aa91c1aa43f1f8101587 Mon Sep 17 00:00:00 2001 From: gokmenkilic Date: Wed, 22 May 2024 16:24:45 +0100 Subject: [PATCH 17/18] removing the conflict --- .github/workflows/docs.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 40f69ef8..00459775 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -91,10 +91,7 @@ jobs: - name: Build docs run: | - if [[ ${{ github.event_name }} == 'pull_request' ]] || [[ "${{ github.event.pull_request.head.repo.fork }}" == "false" ]] ; then - export MKDOCS_SITE_DIR="site/${PREVIEW_SUBDIR}" - export MKDOCS_SITE_URL="${BASE_URL}/${PREVIEW_SUBDIR}" - fi + mkdocs --verbose build - name: Deploy docs From 049a5807e31e382e10645876ba9ed01863f92d2f Mon Sep 17 00:00:00 2001 From: Gokmen Kilic Date: Wed, 22 May 2024 16:31:26 +0100 Subject: [PATCH 18/18] Update .github/workflows/docs.yml Co-authored-by: Tuomas Koskela --- .github/workflows/docs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 00459775..27f72826 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -91,7 +91,6 @@ jobs: - name: Build docs run: | - mkdocs --verbose build - name: Deploy docs