Merge pull request #12 from sintef-ocean/bugfix/bump-deps

Bugfix/bump deps and simplify patches
sintef-ocean · Aug 24, 2024 · ec42257 · ec42257
2 parents c59570d + 593ff51
commit ec42257
Show file tree

Hide file tree

Showing 21 changed files with 214 additions and 64,030 deletions.
diff --git a/.github/workflows/ci-conan-clang.yml b/.github/workflows/ci-conan-clang.yml
@@ -8,22 +8,19 @@ env:
   CONAN_PASSWORD_SINTEF: ${{ secrets.CONAN_PASSWORD }}
   CONAN_LOGIN_USERNAME_SINTEF: ${{ secrets.CONAN_USER }}
   CONFIG_URL: https://github.com/sintef-ocean/conan-configs.git
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+  ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16
+  ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
 
 jobs:
   conan-with-clang:
     name: Conan
     runs-on: ubuntu-22.04
     env:
-      PKG_REFERENCE: >-
-        ${{ matrix.conan == '1.0' &&
-        format('{0}@{1}/{2}', matrix.version, 'sintef', matrix.channel) ||
-        format('--version {0} --user {1} --channel {2}', matrix.version, 'sintef', matrix.channel) }}
-      UPLOAD_FLAGS: "${{ matrix.conan == '1.0' && '--all' || '' }}"
       cppstd: "17"
     strategy:
       fail-fast: false
       matrix:
-        conan: ["2.0"]
         version: [14.1.1]
         build_type: [Debug, Release]
         profile: [clang]
@@ -39,24 +36,22 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y jq
           pip3 install --upgrade setuptools pip
-          pip3 install --upgrade conan~=${{ matrix.conan }}
+          pip3 install --upgrade conan~=2.0
       - name: Configure Conan
         run: conan remote add sintef ${{ env.CONAN_UPLOAD }}
-      - name: Get package name Conan 1
-        if: matrix.conan == '1.0'
-        run: echo "package_name=$(conan inspect --raw name .)" >> $GITHUB_ENV
-      - name: Get package name Conan 2
-        if: matrix.conan == '2.0'
+      - name: Get package name
         run: echo "package_name=$(conan inspect -f json . | jq .name -r)" >> $GITHUB_ENV
       - name: Conan create
         run: |
           git config --global --add safe.directory '*'
-          conan config install ${{ env.CONFIG_URL }}  --type git -sf conan${{ matrix.conan }}
+          conan config install ${{ env.CONFIG_URL }}  --type git -sf conan2.0
           conan config install ${{ env.CONFIG_URL }}  --type git -sf profiles -tf profiles
           conan create -s build_type=${{ matrix.build_type }} \
             -s compiler.version=${{ matrix.compiler_version }} \
             -s compiler.cppstd=${{ env.cppstd }} \
             -pr:b=${{ matrix.profile }} -pr:h=${{ matrix.profile }} \
-            -b missing -b outdated -b ${{ env.package_name }}* . ${{ env.PKG_REFERENCE }}
+            -b missing -b outdated -b ${{ env.package_name }}* \
+            --version ${{ matrix.version }} --user sintef --channel ${{ matrix.channel }} \
+            .
       - name: Conan upload
-        run: conan upload --confirm -r sintef ${{ env.package_name }}* --force ${{ env.UPLOAD_FLAGS }}
+        run: conan upload --confirm -r sintef ${{ env.package_name }}* --force
diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml
@@ -8,22 +8,19 @@ env:
   CONAN_PASSWORD_SINTEF: ${{ secrets.CONAN_PASSWORD }}
   CONAN_LOGIN_USERNAME_SINTEF: ${{ secrets.CONAN_USER }}
   CONFIG_URL: https://github.com/sintef-ocean/conan-configs.git
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+  ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16
+  ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
 
 jobs:
   conan-with-gcc:
     name: Conan
     runs-on: ubuntu-22.04
     env:
-      PKG_REFERENCE: >-
-        ${{ matrix.conan == '1.0' &&
-        format('{0}@{1}/{2}', matrix.version, 'sintef', matrix.channel) ||
-        format('--version {0} --user {1} --channel {2}', matrix.version, 'sintef', matrix.channel) }}
-      UPLOAD_FLAGS: "${{ matrix.conan == '1.0' && '--all' || '' }}"
       cppstd: "17"
     strategy:
       fail-fast: false
       matrix:
-        conan: ["2.0"]
         version: [14.1.1]
         configs: ["default", "fhsim"]
         build_type: [Debug, Release]
@@ -40,19 +37,15 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y jq
           pip3 install --upgrade setuptools pip
-          pip3 install --upgrade conan~=${{ matrix.conan }}
+          pip3 install --upgrade conan~=2.0
       - name: Configure Conan
         run: conan remote add sintef ${{ env.CONAN_UPLOAD }}
-      - name: Get package name Conan 1
-        if: matrix.conan == '1.0'
-        run: echo "pkg_name=$(conan inspect --raw name .)" >> $GITHUB_ENV
-      - name: Get package name Conan 2
-        if: matrix.conan == '2.0'
+      - name: Get package name
         run: echo "pkg_name=$(conan inspect -f json . | jq .name -r)" >> $GITHUB_ENV
       - name: Conan create
         run: |
           git config --global --add safe.directory '*'
-          conan config install ${{ env.CONFIG_URL }}  --type git -sf conan${{ matrix.conan }}
+          conan config install ${{ env.CONFIG_URL }}  --type git -sf conan2.0
           conan config install ${{ env.CONFIG_URL }}  --type git -sf profiles -tf profiles
           conan create -s build_type=${{ matrix.build_type }} \
             -s compiler.version=${{ matrix.compiler_version }} \
@@ -61,6 +54,9 @@ jobs:
             -o ${{ env.pkg_name }}/*:with_sdl=${{ matrix.configs == 'fhsim' && 'False' || 'True' }} \
             -o ${{ env.pkg_name }}/*:plugin_glslang=${{ matrix.configs == 'fhsim' && 'False' || 'True' }} \
             -o ${{ env.pkg_name }}/*:component_bullet=${{ matrix.configs == 'fhsim' && 'False' || 'True' }} \
-            -b missing -b outdated -b ${{ env.pkg_name }}* . ${{ env.PKG_REFERENCE }}
+            -o ${{ env.pkg_name }}/*:with_freetype=${{ matrix.configs == 'fhsim' && 'True' || 'False' }} \
+            -b missing -b outdated -b ${{ env.pkg_name }}* \
+            --version ${{ matrix.version }} --user sintef --channel ${{ matrix.channel }} \
+            .
       - name: Conan upload
-        run: conan upload --confirm -r sintef ${{ env.pkg_name }}* --force ${{ env.UPLOAD_FLAGS }}
+        run: conan upload --confirm -r sintef ${{ env.pkg_name }}* --force
diff --git a/.github/workflows/ci-conan-msvc.yml b/.github/workflows/ci-conan-msvc.yml
@@ -13,53 +13,41 @@ jobs:
   conan-with-msvc:
     name: Conan
     runs-on: windows-2022
-    env:
-      PKG_REFERENCE: >-
-        ${{ matrix.conan == '1.0' &&
-        format('{0}@{1}/{2}', matrix.version, 'sintef', matrix.channel) ||
-        format('--version {0} --user {1} --channel {2}', matrix.version, 'sintef', matrix.channel) }}
-      UPLOAD_FLAGS: "${{ matrix.conan == '1.0' && '--all' || '' }}"
     strategy:
       fail-fast: false
       matrix:
-        conan: ["2.0"]
         version: [14.1.1]
         configs: ["default", "fhsim"]
         build_type: [Debug, Release]
         profile: [msvc17]
-        compiler_version: [191, 192, 193]
+        compiler_version: [192, 194]
         channel: ["${{ (github.head_ref || github.ref_name) == 'master' && 'stable' || 'testing' }}"]
     steps:
       - uses: actions/checkout@v4
       - name: Install prerequisites
         run: |
           pip3 install --upgrade setuptools pip
-          pip3 install --upgrade conan~=${{ matrix.conan }}
+          pip3 install --upgrade conan~=2.0
       - name: Configure Conan
         run: conan remote add sintef ${{ env.CONAN_UPLOAD }}
-      - name: Get package name Conan 1
-        if: matrix.conan == '1.0'
-        shell: pwsh
-        run: |
-          $pkg_name=conan inspect --raw name .
-          echo "pkg_name=$pkg_name" >> $Env:GITHUB_ENV
-      - name: Get package name Conan 2
-        if: matrix.conan == '2.0'
+      - name: Get package name
         shell: pwsh
         run: |
           $pkg_name=conan inspect -f json . | jq .name -r
           echo "pkg_name=$pkg_name" >> $Env:GITHUB_ENV
       - name: Conan create
         run: |
-          conan config install ${{ env.CONFIG_URL }}  --type git -sf conan${{ matrix.conan }}
+          conan config install ${{ env.CONFIG_URL }}  --type git -sf conan2.0
           conan config install ${{ env.CONFIG_URL }}  --type git -sf profiles -tf profiles
           conan create -s build_type=${{ matrix.build_type }} `
             -s compiler.version=${{ matrix.compiler_version }} `
             -pr:b=${{ matrix.profile }} -pr:h=${{ matrix.profile }} `
             -o ${{ env.pkg_name }}/*:with_sdl=${{ matrix.configs == 'fhsim' && 'False' || 'True' }} `
             -o ${{ env.pkg_name }}/*:plugin_glslang=${{ matrix.configs == 'fhsim' && 'False' || 'True' }} `
             -o ${{ env.pkg_name }}/*:component_bullet=${{ matrix.configs == 'fhsim' && 'False' || 'True' }} `
+            -o ${{ env.pkg_name }}/*:with_freetype=${{ matrix.configs == 'fhsim' && 'True' || 'False' }} `
             -b missing -b outdated -b ${{ env.pkg_name }}* `
-            . ${{ env.PKG_REFERENCE }}
+            --version ${{ matrix.version }} --user sintef --channel ${{ matrix.channel }} `
+            .
       - name: Conan upload
-        run: conan upload --confirm -r sintef ${{ env.pkg_name }}* --force ${{ env.UPLOAD_FLAGS }}
+        run: conan upload --confirm -r sintef ${{ env.pkg_name }}* --force
diff --git a/conandata.yml b/conandata.yml
@@ -8,105 +8,66 @@ sources:
     sha256: 857f74d18c4bb484f0e31c288b8d27837615a59c3da2b3d8304496c83ef669cd
     url:
       - https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.5.tar.gz
-  13.5.0:
-    sha256: 94d514d03d421c43af09e916ecd127685e15afed62e2f4cde8949b7818bc4900
-    url:
-      - https://github.com/OGRECave/ogre/archive/refs/tags/v13.5.0.tar.gz
 
 dependencies:
   14.1.1:
-    assimp: 5.2.2
+    assimp: 5.4.2
     bullet3: 3.25
     egl: system
     freeimage: 3.18.0
     freetype: 2.13.2
     glslang: 11.7.0
     gtest: 1.11.0
-    llvm-openmp: 17.0.6
     cmake: "[>=3.16 <4]"
+    imgui: 1.91.0
     openexr: 2.5.9
     opengl: system
     openssl: "[>=1.1 <4]"
     pugixml: 1.14
     qt5: "[>=5.15 <6]"
     qt6: "[>=6.1]"
-    sdl: "[>=2.28.0 <2.30]"
+    sdl: "[>=2.28.0 <2.31]"
     swig: "[>=4 <5]"
-    vulkan-loader: 1.3.268.0
+    vulkan-loader: 1.3.290.0
     xkbcommon: 1.6.0
     xorg: system
     zlib: "[>=1.2.11 <2]"
     libjpeg: 9e
     libpng: 1.6.43
   13.6.5:
-    assimp: 5.2.2
+    assimp: 5.4.2
     bullet3: 3.25
     egl: system
     freeimage: 3.18.0
     freetype: 2.13.2
     glslang: 11.7.0
     gtest: 1.11.0
-    llvm-openmp: 17.0.6
     cmake: "[>=3.16 <4]"
     openexr: 2.5.9
     opengl: system
     openssl: "[>=1.1 <4]"
     pugixml: 1.14
     qt5: "[>=5.15 <6]"
     qt6: "[>=6.1]"
-    sdl: "[>=2.24.1 <2.30]"
+    sdl: "[>=2.24.1 <2.31]"
     swig: "[>=4 <5]"
-    vulkan-loader: 1.3.268.0
+    vulkan-loader: 1.3.290.0
     xkbcommon: 1.6.0
     xorg: system
     zlib: "[>=1.2.11 <2]"
     libjpeg: 9e
     libpng: 1.6.43
-  13.5.0:
-    assimp: 5.2.2
-    bullet3: 3.25
-    egl: system
-    freeimage: 3.18.0
-    freetype: 2.13.2
-    glslang: 11.7.0
-    gtest: 1.11.0
-    llvm-openmp: 17.0.6
-    cmake: "[>=3.16 <4]"
-    openexr: 2.5.9
-    opengl: system
-    openssl: "[>=1.1 <4]"
-    pugixml: 1.14
-    qt5: "[>=5.15 <6]"
-    qt6: "[>=6.1]"
-    sdl: "[>=2 <2.1]"
-    swig: "[>=4 <5]"
-    vulkan-loader: 1.3.268.0
-    xkbcommon: 1.6.0
-    xorg: system
-    zlib: "[>=1.2.11 <2]"
-    libjpeg: 9e
-    libpng: 1.6.43
-
 
 patches:
   14.1.1:
     - patch_file: patches/14.1.1-0001-Set-rpath-with-origin-variants.patch
     - patch_file: patches/14.1.1-0002-Remove-absolute-paths-from-ogre-config.patch
-    - patch_file: patches/14.1.1-0003-Fix-conanized-zip-linking-issue.patch
+    - patch_file: patches/14.1.1-0003-Fix-zip-linking-issue.patch
     - patch_file: patches/14.1.1-0004-Do-conanization-fixes.patch
+    - patch_file: patches/14.1.1-0005-Use-imgui-from-conan.patch
   13.6.5:
     - patch_file: patches/13.6.5-0001-Set-rpath-with-origin-variants.patch
     - patch_file: patches/13.6.5-0002-Remove-absolute-paths-from-ogre-config.patch
-    - patch_file: patches/13.6.5-0003-Fix-conanized-zip-linking-issue.patch
+    - patch_file: patches/13.6.5-0003-Fix-zip-linking-issue.patch
     - patch_file: patches/13.6.5-0004-Do-conanization-fixes.patch
     - patch_file: patches/13.6.5-0005-Add-CTest-Ogre.patch
-  13.5.0:
-    - patch_file: patches/13.5.0-0001-Do-conanization-fixes.patch
-    - patch_file: patches/13.5.0-0002-Fix-zip-linking-issue-for-conanized.patch
-    - patch_file: patches/13.5.0-0003-Do-fixes-to-support-Real-as-float-and-double.patch
-    - patch_file: patches/13.5.0-0004-Remove-absolute-paths-from-ogre-config-paths-header.patch
-    - patch_file: patches/13.5.0-0005-Set-rpath-with-origin-variants.patch
-    - patch_file: patches/13.5.0-0006-Add-openmp-target-imported-only-if-undefined.patch
-    - patch_file: patches/13.5.0-0007-Various-fixes-for-conanv2.patch
-    - patch_file: patches/13.5.0-0008-Add-CTest-Ogre.patch
-    - patch_file: patches/13.5.0-0009-Do-not-use-found-freetype-if-not-requested.patch