From 4d75e5deacaf6ed8807837423d99d44c721e59d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=BCnther?= Date: Sun, 5 Jan 2025 16:19:05 +0100 Subject: [PATCH 1/4] Skip older versions in github workflow build-doc.yml to prevent the warning that artifact size exceeds the allowed size of 1 GB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Günther --- .github/workflows/build-doc.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml index 9c6604b79..9a1f86e0c 100644 --- a/.github/workflows/build-doc.yml +++ b/.github/workflows/build-doc.yml @@ -11,8 +11,6 @@ jobs: strategy: matrix: schema: - - CGMES_2.4.13_18DEC2013 - - CGMES_2.4.15_16FEB2016 - CGMES_2.4.15_27JAN2020 - CGMES_3.0.0 steps: @@ -45,10 +43,8 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest env: - CIM_1: CGMES_2.4.13_18DEC2013 - CIM_2: CGMES_2.4.15_16FEB2016 - CIM_3: CGMES_2.4.15_27JAN2020 - CIM_4: CGMES_3.0.0 + CIM_1: CGMES_2.4.15_27JAN2020 + CIM_2: CGMES_3.0.0 steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -60,8 +56,6 @@ jobs: mkdir -p ./copy_files/docs cp -r ./doc_${{env.CIM_1}} ./copy_files/docs/${{env.CIM_1}} cp -r ./doc_${{env.CIM_2}} ./copy_files/docs/${{env.CIM_2}} - cp -r ./doc_${{env.CIM_3}} ./copy_files/docs/${{env.CIM_3}} - cp -r ./doc_${{env.CIM_4}} ./copy_files/docs/${{env.CIM_4}} cp ./README.md ./copy_files/docs/README.md - name: Upload Artifact github-pages uses: actions/upload-pages-artifact@v3 From e6847bfc694be346a4f2702ebd916cddccc4b278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=BCnther?= Date: Sun, 5 Jan 2025 17:08:52 +0100 Subject: [PATCH 2/4] Add missing index.html as redirection to index.html in the first subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Günther --- .github/workflows/build-doc.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml index 9a1f86e0c..9cfc76d3d 100644 --- a/.github/workflows/build-doc.yml +++ b/.github/workflows/build-doc.yml @@ -46,8 +46,6 @@ jobs: CIM_1: CGMES_2.4.15_27JAN2020 CIM_2: CGMES_3.0.0 steps: - - name: Checkout Repository - uses: actions/checkout@v4 - name: Download uses: actions/download-artifact@v4 - name: Copy @@ -56,7 +54,7 @@ jobs: mkdir -p ./copy_files/docs cp -r ./doc_${{env.CIM_1}} ./copy_files/docs/${{env.CIM_1}} cp -r ./doc_${{env.CIM_2}} ./copy_files/docs/${{env.CIM_2}} - cp ./README.md ./copy_files/docs/README.md + echo "" >./copy_files/docs/index.html - name: Upload Artifact github-pages uses: actions/upload-pages-artifact@v3 with: From 10d3c8006c720b0ee4a3b0b95d6f81882bc7c3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=BCnther?= Date: Sun, 5 Jan 2025 17:20:22 +0100 Subject: [PATCH 3/4] Remove links for older versions from Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Günther --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 719fae91a..d92648f23 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ It is part of the CIM++ project. More on CIM++ can be found [here](http://rdcu.b Supported CIM / CGMES versions: -+ [CGMES_2.4.13_18DEC2013](https://sogno-platform.github.io/libcimpp/CGMES_2.4.13_18DEC2013/annotated.html) -+ [CGMES_2.4.15_16FEB2016](https://sogno-platform.github.io/libcimpp/CGMES_2.4.15_16FEB2016/annotated.html) ++ CGMES_2.4.13_18DEC2013 ++ CGMES_2.4.15_16FEB2016 + [CGMES_2.4.15_27JAN2020](https://sogno-platform.github.io/libcimpp/CGMES_2.4.15_27JAN2020/annotated.html) + [CGMES_3.0.0](https://sogno-platform.github.io/libcimpp/CGMES_3.0.0/annotated.html) From 8473de52e60afc2bb597f6dae940180b4b96ef13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=BCnther?= Date: Sun, 5 Jan 2025 17:21:36 +0100 Subject: [PATCH 4/4] Remove deprecated gitlab-ci file (now really) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Günther --- .gitlab-ci.yml | 79 -------------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index c3c427533..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,79 +0,0 @@ -variables: - DOCKER_TAG_DEV: ${CI_COMMIT_REF_NAME} - DOCKER_IMAGE_DEV: libcimpp-dev - GIT_SUBMODULE_STRATEGY: recursive - -stages: - - prepare - - build-src - - build-doc - - deploy - -docker: - stage: prepare - script: - - docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} . - - docker images - tags: - - shell - -# Template -.build-src: &build-src - stage: build-src - image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} - tags: - - docker - script: - - mkdir -p build/${CIM_VERSION} && cd build/${CIM_VERSION} - - cmake ../.. -DUSE_CIM_VERSION=${CIM_VERSION} - - make -j8 - -build-src-CGMES: - <<: *build-src - variables: - CIM_VERSION: CGMES_2.4.15_27JAN2020 - -build-src-16v29a: - <<: *build-src - variables: - CIM_VERSION: IEC61970_16v29a - -build-src-17v07: - <<: *build-src - variables: - CIM_VERSION: IEC61970_17v07 - -build-src-16v29a-12v08: - <<: *build-src - variables: - CIM_VERSION: IEC61970_16v29a_IEC61968_12v08 - -# Documentation -.build-doc: &build-doc - stage: build-doc - image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} - tags: - - docker - script: - - mkdir -p build/${CIM_VERSION} && cd build/${CIM_VERSION} - - cmake ../.. -DUSE_CIM_VERSION=${CIM_VERSION} - - make doc - artifacts: - paths: - - build/${CIM_VERSION}/doc/html - expire_in: 6 months - -build-doc-16v29a: - <<: *build-doc - variables: - CIM_VERSION: IEC61970_16v29a - -build-doc-17v07: - <<: *build-doc - variables: - CIM_VERSION: IEC61970_17v07 - -build-doc-16v29a-12v08: - <<: *build-doc - variables: - CIM_VERSION: IEC61970_16v29a_IEC61968_12v08 \ No newline at end of file