Skip to content

Commit

Permalink
Update dockerfiles and docs (#24)
Browse files Browse the repository at this point in the history
This PR updates dockerfiles and documentation, adds a devcontainer file
and removes old CIM/CGMES versions that are likely not needed anymore.
  • Loading branch information
m-mirz authored Mar 26, 2024
2 parents bd5ddde + ba700b7 commit 1bd4c54
Show file tree
Hide file tree
Showing 2,200 changed files with 43 additions and 225,117 deletions.
16 changes: 16 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "libcimpp",
//"image": "",
"build": {
"dockerfile": "../Dockerfile"
},
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools",
"ms-vscode.cmake-tools",
"editorconfig.editorconfig"
]
}
}
}
68 changes: 1 addition & 67 deletions .github/workflows/build-doc.yml
Original file line number Diff line number Diff line change
@@ -1,71 +1,9 @@
name: build-doc

on: workflow_dispatch

on: push

jobs:

build-doc-IEC61970_16v29a:
runs-on: ubuntu-latest
env:
USE_CIM_VERSION: IEC61970_16v29a
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Install Doxygen
run: sudo apt-get install doxygen
shell: bash
- name: Install Graphviz
run: sudo apt-get install graphviz
shell: bash
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}

- name: Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
run: |
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
make doc
- uses: actions/upload-artifact@v3
with:
name: doc_${{env.USE_CIM_VERSION}}
path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html
retention-days: 90



build-doc-IEC61970_17v07:
runs-on: ubuntu-latest
env:
USE_CIM_VERSION: IEC61970_17v07
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Install Doxygen
run: sudo apt-get install doxygen
shell: bash
- name: Install Graphviz
run: sudo apt-get install graphviz
shell: bash
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}

- name: Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
run: |
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
make doc
- uses: actions/upload-artifact@v3
with:
name: doc_${{env.USE_CIM_VERSION}}
path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html

build-doc-IEC61970_16v29a_IEC61968_12v08:
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -95,7 +33,6 @@ jobs:
name: doc_${{env.USE_CIM_VERSION}}
path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html


build-doc-CGMES_2-4-15_27JAN2020:
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -124,6 +61,3 @@ jobs:
with:
name: doc_${{env.USE_CIM_VERSION}}
path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html



42 changes: 2 additions & 40 deletions .github/workflows/build-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
name: build-gh-pages


on: [push]
#on: workflow_dispatch
on: workflow_dispatch

jobs:
build-gh-pages:

runs-on: ubuntu-latest
env:
USE_CIM_VERSION1: IEC61970_16v29a_IEC61968_12v08
USE_CIM_VERSION2: IEC61970_16v29a
USE_CIM_VERSION3: IEC61970_17v07
USE_CIM_VERSION4: CGMES_2.4.15_27JAN2020
steps:
- uses: actions/checkout@v3
Expand All @@ -37,42 +32,9 @@ jobs:
run: |
mkdir -p ./copy_files/docs
cp -r ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION1}}/doc/html ./copy_files/docs/${{env.USE_CIM_VERSION1}}
- name: CIM2 Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}

- name: CIM2 Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}/
run: |
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION2}}
make doc
- name: CIM2 Copy
run: |
mkdir -p ./copy_files/docs
cp -r ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}/doc/html ./copy_files/docs/${{env.USE_CIM_VERSION2}}
- name: CIM3 Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}

- name: CIM3 Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}/
run: |
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION3}}
make doc
- name: CIM3 Copy
run: |
mkdir -p ./copy_files/docs
cp -r ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}/doc/html ./copy_files/docs/${{env.USE_CIM_VERSION3}}

- name: CIM4 Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION4}}

- name: CIM4 Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION4}}/
Expand Down
60 changes: 1 addition & 59 deletions .github/workflows/build-src.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,8 @@
name: build-src

#on: [push]
on: workflow_dispatch

on: push

jobs:

build-src-IEC61970_16v29a:
runs-on: ubuntu-latest
env:
USE_CIM_VERSION: IEC61970_16v29a
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Install Doxygen
run: sudo apt-get install doxygen
shell: bash
- name: Install Graphviz
run: sudo apt-get install graphviz
shell: bash
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}

- name: Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
run: |
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
make -j4
build-src-IEC61970_17v07:
runs-on: ubuntu-latest
env:
USE_CIM_VERSION: IEC61970_17v07
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Install Doxygen
run: sudo apt-get install doxygen
shell: bash
- name: Install Graphviz
run: sudo apt-get install graphviz
shell: bash
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}

- name: Configure CMake and compile
shell: bash
working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
run: |
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
make -j4
build-src-IEC61970_16v29a_IEC61968_12v08:
runs-on: ubuntu-latest
env:
Expand All @@ -83,10 +28,8 @@ jobs:
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
make -j4
build-src-CGMES_2-4-15_27JAN2020:
runs-on: ubuntu-latest

env:
USE_CIM_VERSION: CGMES_2.4.15_27JAN2020
steps:
Expand All @@ -109,4 +52,3 @@ jobs:
cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
make -j4
Loading

0 comments on commit 1bd4c54

Please sign in to comment.