mirror of
https://github.com/OPM/ResInsight.git
synced 2025-01-01 03:37:15 -06:00
Update files
This commit is contained in:
parent
1d23e8f5c9
commit
2cd7576413
16
.github/workflows/AppFwkUnitTest.yml
vendored
16
.github/workflows/AppFwkUnitTest.yml
vendored
@ -10,33 +10,25 @@ jobs:
|
||||
os: [ubuntu-latest, windows-latest]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Cache Qt
|
||||
id: cache-qt
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ${{ github.workspace }}/Qt/
|
||||
key: ${{ runner.os }}-QtCache-5-12-12
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: 5.12.12
|
||||
modules: qtscript
|
||||
dir: "${{ github.workspace }}/Qt/"
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
cache: true
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: "contains( matrix.os, 'ubuntu')"
|
||||
run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
|
||||
|
||||
- name: Build AppFwk with Unit Tests
|
||||
uses: lukka/run-cmake@v1
|
||||
uses: lukka/run-cmake@v3
|
||||
with:
|
||||
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
|
||||
cmakeListsTxtPath: "${{ github.workspace }}/Fwk/AppFwk/CMakeLists.txt"
|
||||
cmakeAppendedArgs:
|
||||
buildDirectory: ${{ github.workspace }}/cmakebuild
|
||||
buildWithCMakeArgs: "--config Release"
|
||||
useVcpkgToolchainFile: false
|
||||
|
15
.github/workflows/ResInsightWithCache.yml
vendored
15
.github/workflows/ResInsightWithCache.yml
vendored
@ -52,7 +52,7 @@ jobs:
|
||||
}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
@ -124,20 +124,13 @@ jobs:
|
||||
run: echo "${{github.workspace}}/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
|
||||
shell: pwsh
|
||||
|
||||
- name: Cache Qt
|
||||
id: cache-qt
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ github.workspace }}/Qt/
|
||||
key: ${{ matrix.config.os }}-QtCache-5-12-12
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
setup-python: false
|
||||
version: 5.12.12
|
||||
modules: qtscript qtcharts
|
||||
modules: qtscript
|
||||
dir: "${{ github.workspace }}/Qt/"
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
cache: true
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: "contains( matrix.config.os, 'ubuntu')"
|
||||
|
56
.github/workflows/clang-format.yml
vendored
56
.github/workflows/clang-format.yml
vendored
@ -6,32 +6,30 @@ jobs:
|
||||
clang-format-job:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Install clang-format 10.0
|
||||
run: |
|
||||
sudo apt install clang-format
|
||||
clang-format --version
|
||||
- uses: actions/checkout@v2
|
||||
- name: Check format - ApplicationLibCode
|
||||
run: |
|
||||
cd ApplicationLibCode
|
||||
find -name *.h -o -name *.cpp -o -name *.inl | xargs clang-format -i
|
||||
git diff
|
||||
- name: Check format - ApplicationExeCode
|
||||
run: |
|
||||
cd ApplicationExeCode
|
||||
find -name *.h -o -name *.cpp -o -name *.inl | xargs clang-format -i
|
||||
git diff
|
||||
- name: Check format - AppFwk
|
||||
run: |
|
||||
cd Fwk/AppFwk
|
||||
find -name *.h -o -name *.cpp -o -name *.inl | grep -v gtest | xargs clang-format -i
|
||||
git diff
|
||||
- uses: peter-evans/create-pull-request@v3
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: 'Fixes by clang-format'
|
||||
title: 'Fixes by clang-format'
|
||||
branch: clang-format-patches
|
||||
branch-suffix: random
|
||||
|
||||
|
||||
- name: Install clang-format 10.0
|
||||
run: |
|
||||
sudo apt install clang-format
|
||||
clang-format --version
|
||||
- uses: actions/checkout@v3
|
||||
- name: Check format - ApplicationLibCode
|
||||
run: |
|
||||
cd ApplicationLibCode
|
||||
find -name *.h -o -name *.cpp -o -name *.inl | xargs clang-format -i
|
||||
git diff
|
||||
- name: Check format - ApplicationExeCode
|
||||
run: |
|
||||
cd ApplicationExeCode
|
||||
find -name *.h -o -name *.cpp -o -name *.inl | xargs clang-format -i
|
||||
git diff
|
||||
- name: Check format - AppFwk
|
||||
run: |
|
||||
cd Fwk/AppFwk
|
||||
find -name *.h -o -name *.cpp -o -name *.inl | grep -v gtest | xargs clang-format -i
|
||||
git diff
|
||||
- uses: peter-evans/create-pull-request@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: "Fixes by clang-format"
|
||||
title: "Fixes by clang-format"
|
||||
branch: clang-format-patches
|
||||
branch-suffix: random
|
||||
|
52
.github/workflows/clang-tidy.yml
vendored
52
.github/workflows/clang-tidy.yml
vendored
@ -4,7 +4,7 @@ on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
# Once every night
|
||||
- cron: '0 1 * * * '
|
||||
- cron: "0 1 * * * "
|
||||
|
||||
jobs:
|
||||
ResInsight-x64-buildcache:
|
||||
@ -13,32 +13,29 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
config:
|
||||
- {
|
||||
name: "Ubuntu 20.04",
|
||||
os: ubuntu-20.04,
|
||||
cc: "gcc", cxx: "g++",
|
||||
vcpkg-response-file: vcpkg_x64-linux.txt,
|
||||
vcpkg-triplet: x64-linux,
|
||||
cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu 20.04",
|
||||
os: ubuntu-20.04,
|
||||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
vcpkg-response-file: vcpkg_x64-linux.txt,
|
||||
vcpkg-triplet: x64-linux,
|
||||
cmake-toolchain: "ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||
}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: true
|
||||
- name: Cache Qt
|
||||
id: cache-qt
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ${{ github.workspace }}/Qt/
|
||||
key: ${{ matrix.config.os }}-QtCache-5-12-12
|
||||
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: 5.12.12
|
||||
modules: qtscript qtcharts
|
||||
dir: '${{ github.workspace }}/Qt/'
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
modules: qtscript
|
||||
dir: "${{ github.workspace }}/Qt/"
|
||||
cache: true
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: "contains( matrix.config.os, 'ubuntu')"
|
||||
run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
||||
@ -47,12 +44,13 @@ jobs:
|
||||
with:
|
||||
VCPKGRESPONSEFILE: ${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}
|
||||
- name: Run vcpkg
|
||||
uses: lukka/run-vcpkg@v7
|
||||
uses: lukka/run-vcpkg@v10
|
||||
id: runvcpkg
|
||||
with:
|
||||
vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
|
||||
vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
|
||||
# Ensure the cache key changes any time the content of the response file changes.
|
||||
vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"
|
||||
vcpkgDirectory:
|
||||
"${{ github.workspace }}/ThirdParty/vcpkg"
|
||||
# Ensure the cache key changes any time the content of the response file changes.
|
||||
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-clang-tidy-v01
|
||||
- name: Create compile commands and run clang-tidy
|
||||
# https://clang.llvm.org/extra/doxygen/run-clang-tidy_8py_source.html
|
||||
@ -89,10 +87,10 @@ jobs:
|
||||
cd ThirdParty/vcpkg
|
||||
git reset --hard HEAD
|
||||
git clean -fxd
|
||||
- uses: peter-evans/create-pull-request@v3
|
||||
- uses: peter-evans/create-pull-request@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: 'Fixes by clang-tidy'
|
||||
title: 'Fixes by clang-tidy'
|
||||
commit-message: "Fixes by clang-tidy"
|
||||
title: "Fixes by clang-tidy"
|
||||
branch: clang-tidy-patches
|
||||
branch-suffix: random
|
||||
|
50
.github/workflows/cmake-format.yml
vendored
50
.github/workflows/cmake-format.yml
vendored
@ -6,32 +6,32 @@ jobs:
|
||||
cmake-format-job:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install cmakelang for cmake-format
|
||||
run: |
|
||||
python3 -m pip install --user cmakelang
|
||||
- uses: actions/checkout@v2
|
||||
- name: Check format - ApplicationLibCode
|
||||
run: |
|
||||
~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i CMakeLists.txt
|
||||
- name: Install cmakelang for cmake-format
|
||||
run: |
|
||||
python3 -m pip install --user cmakelang
|
||||
- uses: actions/checkout@v3
|
||||
- name: Check format - ApplicationLibCode
|
||||
run: |
|
||||
~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i CMakeLists.txt
|
||||
|
||||
cd ApplicationLibCode
|
||||
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
find -name CMake*.cmake | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
cd ..
|
||||
cd ApplicationLibCode
|
||||
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
find -name CMake*.cmake | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
cd ..
|
||||
|
||||
cd ApplicationExeCode
|
||||
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
cd ..
|
||||
cd ApplicationExeCode
|
||||
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
cd ..
|
||||
|
||||
cd Fwk/AppFwk
|
||||
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
cd ..
|
||||
cd Fwk/AppFwk
|
||||
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
|
||||
cd ..
|
||||
|
||||
git diff
|
||||
- uses: peter-evans/create-pull-request@v3
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: 'Fixes by cmake-format'
|
||||
title: 'Fixes by cmake-format'
|
||||
branch: cmake-format-patches
|
||||
branch-suffix: random
|
||||
git diff
|
||||
- uses: peter-evans/create-pull-request@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: "Fixes by cmake-format"
|
||||
title: "Fixes by cmake-format"
|
||||
branch: cmake-format-patches
|
||||
branch-suffix: random
|
||||
|
6
.github/workflows/delete_artifacts.yml
vendored
6
.github/workflows/delete_artifacts.yml
vendored
@ -3,7 +3,7 @@ name: Remove old artifacts
|
||||
on:
|
||||
schedule:
|
||||
# Every day at 1am
|
||||
- cron: '0 1 * * *'
|
||||
- cron: "0 1 * * *"
|
||||
|
||||
jobs:
|
||||
remove-old-artifacts:
|
||||
@ -12,9 +12,9 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: setup python
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: 3.8
|
||||
- name: Remove old artifacts
|
||||
|
10
.github/workflows/python-linting.yml
vendored
10
.github/workflows/python-linting.yml
vendored
@ -6,18 +6,18 @@ jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-python@v2
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-python@v4
|
||||
- name: (Python) Use black to do linting
|
||||
run: |
|
||||
pip install black
|
||||
cd GrpcInterface
|
||||
black .
|
||||
- uses: peter-evans/create-pull-request@v3
|
||||
- uses: peter-evans/create-pull-request@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: 'Python code linting changes detected by black'
|
||||
title: 'Fixes by black (Python)'
|
||||
commit-message: "Python code linting changes detected by black"
|
||||
title: "Fixes by black (Python)"
|
||||
branch: python-black-patches
|
||||
branch-suffix: random
|
||||
base: ${{ github.head_ref }}
|
||||
|
25
.github/workflows/spell-check.yml
vendored
25
.github/workflows/spell-check.yml
vendored
@ -5,20 +5,17 @@ on:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: sobolevn/misspell-fixer-action@master
|
||||
with:
|
||||
options: '-rsvnuR ApplicationLibCode/'
|
||||
- uses: peter-evans/create-pull-request@v3
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: 'Fixes by misspell-fixer'
|
||||
title: 'Typos fix by misspell-fixer'
|
||||
branch: spell-check-patches
|
||||
branch-suffix: random
|
||||
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
- uses: sobolevn/misspell-fixer-action@master
|
||||
with:
|
||||
options: "-rsvnuR ApplicationLibCode/"
|
||||
- uses: peter-evans/create-pull-request@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: "Fixes by misspell-fixer"
|
||||
title: "Typos fix by misspell-fixer"
|
||||
branch: spell-check-patches
|
||||
branch-suffix: random
|
||||
|
Loading…
Reference in New Issue
Block a user