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