Commit Graph
214 Commits
Author SHA1 Message Date
Magne Sjaastad 6d0bc0b753 Use action to install buildcache 2025-11-10 14:58:55 +01:00
Magne Sjaastad 47d03179c3 Removes branch check for tag releases. 2025-10-13 14:35:42 +02:00
Kristian Bendiksen a3ec18bd04 Github Actions: workaround missing libcrypto in latest buildcache. 2025-09-04 08:33:16 +02:00
Magne Sjaastad 917136fec8 Release 2025.09.0 2025-09-01 12:38:48 +02:00
Magne Sjaastad 452b00ed59 Update build workflow related to caching of vcpkg 2025-06-10 10:52:18 +02:00
Magne Sjaastad 1d90a41395 Use NuGet packages as vcpkg cache
* Use NuGet packages as vcpkg cache
* Do not install additional python version
2025-05-09 08:32:04 +02:00
Magne Sjaastad f96374a6b4 2025.04.0 Merge dev into main 2025-04-07 12:21:57 +02: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
Magne Sjaastad 123baa5d4e Create update-submodules.yml
Update specified submodules to latest available version by creating a PR for each submodule.
2024-08-13 13:59:47 +02:00
Magne Sjaastad aac694b66a Add configuration file for Dependabot used to create PR when selected submodules are updated 2024-08-13 09:53:39 +02:00
Magne Sjaastad 2680611a7a Use latest buildcache version 2024-07-25 10:29:16 +02:00
Magne Sjaastad 7f4f8732e1 Revert "#11485 Disable Python and unit test to fix build on GitHub"
This reverts commit 742bb5f0d2.
2024-06-13 09:17:23 +02:00
Magne Sjaastad 742bb5f0d2 #11485 Disable Python and unit test to fix build on GitHub
Recent changes on GitHub is breaking the build. Temporarily disable Python and unit tests as a workaround.

https://github.com/actions/runner-images/issues/10004
2024-06-10 11:44:36 +02:00
Magne Sjaastad 431c8f5a27 Build release only for vcpkg packages 2024-06-09 12:17:25 +02:00
Magne Sjaastad b050cac1d2 Make it possible to build Octave plugins independent to main build
The building of Octave plugins within main ResInsight build on RHEL8 cause the build to use gcc-12, and gcc-12 is extremely slow when building opm-common.

Adjust the CMake configuration so it is possible to build the Octave plugins as an independent build job. The plugin binaries can then be uploaded to an external server. The main ResInsight build  can download the binaries and include them in the install package for ResInsight.

Use the flag RESINSIGHT_USE_EXTERNAL_OCTAVE_PLUGINS to download external Octave plugin binaries.
2024-06-04 07:42:50 +02:00
Magne Sjaastad 1e07b239d1 Simplify configuration and use of vcpkg
* Simplify configuration and use of vcpkg
* Use 22.04
* Set and use BUILD_TYPE = Release
* Use -DVCPKG_BUILD_TYPE=release
2024-05-31 08:56:29 +02:00
Magne Sjaastad 2fb54ac1ec Add qtnetworkauth to clang-tidy workflow 2024-05-29 10:14:41 +02:00
Kristian Bendiksen d02dd2dfed Add Qt network auth to github actions. 2024-05-24 15:19:43 +02:00
Magne Sjaastad bbebdbba4c Bump to Python 3.11 2024-05-22 10:04:16 +02:00
Magne Sjaastad 2ad6c0fff2 Set artifact retention-days to 5
The delete artifact action is no longer working, set retention-days to 5
2024-05-10 09:09:46 +02:00
Kristian Bendiksen 55c0e81d9e OpenSSL: remove OpenSSL bundling.
The OpenSSL library from vcpkg is unlikely to be the one needed by Qt.
2024-04-26 11:59:47 +02:00
Magne Sjaastad 869a2430ae Revert "Pin cmake to 3.28.x due to build issues with 3.29"
This reverts commit df0a86f076.

Issue was fixed in 3.29.2
https://gitlab.kitware.com/cmake/cmake/-/issues/25873
2024-04-14 20:27:08 +02:00
Magne Sjaastad df0a86f076 Pin cmake to 3.28.x due to build issues with 3.29 2024-04-07 14:16:12 +02:00
Magne Sjaastad 820fa561ba Fix deploy to pypi 2024-03-25 12:57:49 +01:00
Magne Sjaastad 63defd0f1a GHA: Update to peter-evans/create-pull-request@v6 2024-03-17 11:06:19 +01:00
Magne Sjaastad e94ac51568 Optionally install python modules defined in dev-requirements.txt 2024-02-15 09:47:20 +01:00
Magne Sjaastad 8fe385adcf Create binary artifacts for Linux
* Bundle Qt binaries and create artifacts on Linux 
* Add qt.conf for Linux
* Remove install target for unit test
2024-02-13 09:06:38 +01:00
jonjenssen 5391179e16 Add separate target for unit tests for easier test access. Remove unit tests from ResInsight application. (#11184)
Clean up cmake configuration a bit, and pull down gtest when needed, no longer use a thirdparty subfolder
Add a ResInsight-tests target to run the unit tests
2024-02-11 20:04:04 +01:00
Magne Sjaastad e83b2e92f3 Add and use clang-tidy for GrpcInterface 2024-01-29 15:00:55 +01:00
Magne Sjaastad ad34bbf125 Use latest version of actions
* Update checkout action
* Update setup-python
* Update get-current-time
* Update cache
* Update upload-artifact
2024-01-26 12:45:25 +01:00
Magne Sjaastad edf44cb4c0 Prepare CMake to support both Qt5 andf Qt6
CEE_USE_QT6 controls if Qt6 is used.
Improved install and package for Qt6, target version Qt 6.5.3
Added Qt6 to github action for AppFwkUnitTest
2024-01-09 11:02:41 +01:00