Commit Graph
337 Commits
Author SHA1 Message Date
Magne Sjaastad 61504636b2 Updates CMake version requirements and workflow
Removes the CMake version check that caused issues with newer CMake versions.

Prints the CMake version in the workflow to aid in debugging.

Sets a minimum CMake policy version in CMakePresets.json. This is required to be able to build with CMake 4
2025-07-08 16:42:17 +02:00
Magne Sjaastad 0f73ef0e1c Update vcpkg-cache action to latest
Allows usage of cache from default branch in addition to PR branch
2025-07-08 16:42:17 +02:00
Magne Sjaastad 84671d1027 Remove publish to TestPyPi 2025-06-19 20:40:19 +02:00
Magne Sjaastad 16aa8946f5 GHA: Include compiler name in vcpkg cache prefix
Reduce the cache size by creating key including the compiler name
2025-06-01 08:35:25 +02:00
Magne Sjaastad 45104f4c04 Revert "Use NuGet for vcpkg cache"
This reverts commit d628760339.
2025-05-30 16:24:17 +02:00
Magne Sjaastad d628760339 Use NuGet for vcpkg cache 2025-05-28 08:03:07 +02:00
dependabot[bot] 0b2622eafe Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-27 11:21:25 +02:00
Magne Sjaastad 7ec304e011 Build Python wheels 2025-05-26 06:43:56 +02:00
Magne Sjaastad 7d06f78d54 Use GitHub cache instead of temporary NuGet 2025-05-26 06:42:45 +02:00
Kristian Bendiksen 25f312e117 Python: use python version from mypy.ini (bumped to 3.11). 2025-05-20 20:39:07 +02:00
Magne Sjaastad b380af16c6 GHA: Adjust condition for publish to TestPyPi 2025-05-20 10:05:44 +02:00
Magne Sjaastad 8d8a4705a7 Add publish to TestPyPi
Check if there is a tag on dev-branch for the current version. If not, create tag on dev-branch and publish python package to TestPyPi
2025-05-20 09:41:55 +02:00
Magne Sjaastad a693c6a21e Update to clang-tidy-19 and clang-format-19
Use updated cache for vcpkg.
2025-05-19 14:31:30 +02:00
Magne Sjaastad a958912378 Update opm-common
* Update opm-common
Include fix for tNavigator summary import
* Build opm-common from source
* Remove binary caching of opm-common
The caching is no longer required as a clean build takes minutes. In a previous version the build time was up to an hour on some systems.
2025-05-14 06:57:25 +02:00
Magne Sjaastad 53517fad83 GHA: Use clang-19
clang-19 is required c++23 features
2025-05-09 15:54:28 +02:00
Magne Sjaastad 83d8dd8914 #12424 Use default vcpkg triplet 2025-04-28 07:17:26 +02:00
Magne Sjaastad 43cc4d5d95 Use NuGet packages as vcpkg cache
* Use NuGet packages as vcpkg cache
* Do not install additional python version
2025-04-22 18:22:48 +02:00
Magne Sjaastad a09a189214 Update to clang-tidy 18
* remove unused variable
* Use clang-18 for ResInsight build
* Update to clang-tidy-18
* Add NOLINTNEXTLINE
2025-04-14 20:31:11 +02:00
Magne Sjaastad 89b2de19b4 Use default cmake 2025-04-14 15:54:57 +02:00
Kristian Bendiksen b136616f37 Add clang-format config for proto files. 2025-04-14 08:41:35 +02:00
Magne Sjaastad 892d7251ee Update to clang-format-18
Update to clang-format-18
Code changes related to clang-format-18
2025-04-11 18:34:32 +02:00
Kristian Bendiksen 13133283fe Use python 3.11 for mypy check. 2025-04-10 17:58:59 +02:00
Magne Sjaastad 60d2bf0483 GHA: Skip check on event_name
Make the trigger for publish to PyPi more general
2025-04-08 12:48:22 +02:00
Magne Sjaastad 7147451c54 #12336 Temporary fix for broken build on GitHub runners
Make installed cmake unavailable for runners. On Windows, remove the path to cmake from global path. On Linux, remove the cmake binary.
2025-04-02 17:17:59 +02:00
Magne Sjaastad c944b522c9 GHA: Add check for main branch for publish to PyPi 2025-02-24 15:04:18 +01:00
Magne Sjaastad ad310714c2 GHA: Update runner images 2025-02-13 08:13:03 +01:00
Magne Sjaastad 33c94abd21 Remove debug symbols for Windows vcpkg builds
The cache on GitHub is limited to 10 GB. Recent versions of vcpkg includes debug symbols in Windows release builds, and creates really huge binary libraries.

To make sure the binaries fit into the cache, the debug symbols are removed from both debug and release builds.
2025-02-09 18:41:07 +01:00
Magne Sjaastad 1627ada696 Bump minimum required CMake to 3.26
* Bump minimum required CMake to 3.26

Recently, dependencies using vcpkg was updated, including boost 1.86. When boost 1.86 is linked by ResInsight, the minimum required CMake version is 3.26.

It is possible to manage dependencies manually without using vcpkg. In this case, the ResInsight build might work with a lower CMake requirement. This scenario is not tested by the ResInsight team.

* Use minimum required version of CMake when building on GitHub Action
2025-01-27 11:16:32 +01:00
Magne Sjaastad 3f08901379 Use updated opm-common
* Update opm-common submodule and use branch development https://github.com/CeetronSolutions/opm-common/tree/development

* Add cmake-format of ThirdParty/custom-opm-common/CMakeLists.txt

* Add boost-test

* Update generated files and simplify CMake configuration

Add -D_USE_MATH_DEFINES to CMake to avoid multiple local defines
Introduce flag CREATE_OPM_COMMON_KEYWORDS used to generate C++ files JSON files. This enables use also in MSVC. Remove obsolete direct include of source files.

* Update generated ESMRY test file

There was a invalid extra : postfix for some keywords like NEWTON and other N* keywords. When creating ESRMY using updated opm-common fix this issue.

* Update URL for custom-opm-common
2025-01-22 08:34:46 +01:00
Magne Sjaastad ed66ee9355 GHA: Disable install and use of grpc on GitHub Actions
* GHA: Disable install and use of grpc on GitHub Actions

The current grpc package installed as part of vcpkg is huge, and is rejected from the cache on GitHub Action. This causes a very long build time for Windows builds.

Temporarily disable build of grpc for Windows
2025-01-21 13:54:58 +01:00
Magne Sjaastad 8822de0aee Use Qt 6.6.3 on Windows 2024-11-28 09:07:52 +01:00
Magne Sjaastad 811ae1d0be Update ResInsightWithCache.yml
Use runner ubuntu-24 and default gcc 13
2024-11-13 21:37:25 +01:00
Magne Sjaastad 924687b11e Remove qt5compat 2024-10-29 14:26:41 +01:00
Magne Sjaastad 383c7e071d Merge in latest changes from main (#11782)
Merge main into dev after release of 2024.9.1
Includes changes to build related to conflicting Python requirements

ortools is used in the Komodo environment. This environment is not compatible with libprotoc 27 and newer. Use pinning to limit version of libprotoc<27.

Add dependency on typing_extensions
2024-10-16 09:27:09 +02:00
Kristian Bendiksen d01ef325fa GA: Remove Qt5 builds for AppFwkUnitTest jobs. 2024-10-04 15:27:43 +02:00
212f5bf5ae Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
dependabot[bot] 9b5c5ae0d3 Bump peter-evans/create-pull-request from 6 to 7
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-09 13:37:40 +02:00
Magne Sjaastad 7ba4329bb4 Add qt-version to matrix configuration 2024-09-06 12:11:50 +02:00
Magne Sjaastad 9deeb41f4c Drop vcpkg from update-submodule automation 2024-09-02 08:06:56 +02:00
dependabot[bot] 7c9db3d48b Bump actions/upload-artifact from 2 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-19 16:33:35 +02:00
Magne Sjaastad 478ac1868f Add comment on how to activate tests on GitHub
The generated PR does not have any tests. Close and reopen the PR to activate tests.
2024-08-14 15:14:00 +02:00
Magne Sjaastad b717615bfd Use create-pull-request for update of submodules 2024-08-14 15:05:01 +02:00
Magne Sjaastad 3fdb30d1e9 Improve workflow for clang-tidy
Use github action cache for vcpkg
2024-08-14 12:51:16 +02:00
dependabot[bot] 3fbe38343d Bump celinekurpershoek/link-checker from 1.0.1 to 1.0.2
Bumps [celinekurpershoek/link-checker](https://github.com/celinekurpershoek/link-checker) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/celinekurpershoek/link-checker/releases)
- [Commits](https://github.com/celinekurpershoek/link-checker/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: celinekurpershoek/link-checker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 11:47:31 +02:00
dependabot[bot] d38db625d6 Bump actions/checkout from 2 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 11:05:34 +02:00
dependabot[bot] f1fa944c58 Bump jurplel/install-qt-action from 3 to 4
Bumps [jurplel/install-qt-action](https://github.com/jurplel/install-qt-action) from 3 to 4.
- [Release notes](https://github.com/jurplel/install-qt-action/releases)
- [Commits](https://github.com/jurplel/install-qt-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: jurplel/install-qt-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 11:05:00 +02:00
dependabot[bot] 98aacf2a54 Bump actions/github-script from 6 to 7
Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 11:02:39 +02:00
Magne Sjaastad 17ba68f45b Use Dependabot to update the version of GitHub actions used in our own GitHub Actions 2024-08-13 16:02:23 +02:00
Magne Sjaastad c0334cce62 Update update-submodules.yml 2024-08-13 15:51:34 +02:00
Magne Sjaastad 0ee28b73dd Update update-submodules.yml 2024-08-13 15:32:19 +02:00