From 11173115218a0c5e3e1313df99d679661ce51834 Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Wed, 18 Sep 2024 10:52:25 +0200
Subject: [PATCH 1/6] Remove deprecated variable setting

---
 conanfile.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/conanfile.py b/conanfile.py
index 20fdf1d59..6b523e0ec 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -5,7 +5,7 @@
 from conan.tools.scm import Version
 from conan.errors import ConanInvalidConfiguration
 
-required_conan_version = ">=1.56.0"
+required_conan_version = ">=2.7.0"
 
 
 class FDM_MaterialsConan(ConanFile):
@@ -43,7 +43,6 @@ def package_info(self):
         self.cpp_info.includedirs = []
         self.cpp_info.resdirs = ["res"]
         self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res", "resources"))
-        self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res", "resources"))
 
     def package_id(self):
         self.info.clear()

From cc214a525d1c2127a2a01d6124b4b0cb28185891 Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Wed, 18 Sep 2024 10:59:32 +0200
Subject: [PATCH 2/6] Use common workflows and remove obsolete ones

---
 .github/workflows/build.yml                   | 51 -------------------
 .github/workflows/cicd.yml                    |  3 +-
 .github/workflows/conan-package.yml           | 17 +++----
 .../notify_on_print_profile_change.yml        | 27 ----------
 .../workflows/requirements-conan-package.txt  |  1 -
 5 files changed, 8 insertions(+), 91 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/notify_on_print_profile_change.yml
 delete mode 100644 .github/workflows/requirements-conan-package.txt

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 27623ee24..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-name: Build
-on:
-  push:
-    branches:
-    - "**"
-    - "!master"
-    tags-ignore: "**"
-
-env:
-  IMAGE_BASE: docker.pkg.github.com/${{ github.repository }}
-  GITHUB_TOKEN: ${{ secrets.GitHub_PAT }}
-
-jobs:
-  context:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
-      - name: Dump job context
-        env:
-          JOB_CONTEXT: ${{ toJson(job) }}
-        run: echo "$JOB_CONTEXT"
-      - name: Dump steps context
-        env:
-          STEPS_CONTEXT: ${{ toJson(steps) }}
-        run: echo "$STEPS_CONTEXT"
-      - name: Dump runner context
-        env:
-          RUNNER_CONTEXT: ${{ toJson(runner) }}
-        run: echo "$RUNNER_CONTEXT"
-      - name: Dump strategy context
-        env:
-          STRATEGY_CONTEXT: ${{ toJson(strategy) }}
-        run: echo "$STRATEGY_CONTEXT"
-      - name: Dump matrix context
-        env:
-          MATRIX_CONTEXT: ${{ toJson(matrix) }}
-        run: echo "$MATRIX_CONTEXT"
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: true # 'recursive' 'true' or 'false'
-        token: ${{ secrets.GitHub_PAT }} # `GitHub_PAT` is a secret contains your PAT.
-    - run: echo "${GITHUB_TOKEN}" | docker login -u stardust-c3po --password-stdin docker.pkg.github.com
-    - run: docker run -i -u "$(id -u)" -v "$(pwd):/source" --rm -e CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DEMBEDDED=ON" docker.pkg.github.com/ultimaker/print-cluster-jedi-scripts/print-cluster-jedi-scripts-cmake:latest
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 036545635..6d77d1f8b 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -1,4 +1,3 @@
----
 name: CI/CD
 on: [push, pull_request]
 jobs:
@@ -8,7 +7,7 @@ jobs:
     container: python:3.7-slim
     steps:
     - name: Checkout master
-      uses: actions/checkout@v1.2.0
+      uses: actions/checkout@v4
     - name: Install lxml
       run: python -m pip install lxml==4.6.5
     - name:
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index 80c5474cf..582c486f4 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -13,21 +13,18 @@ on:
     branches:
       - main
       - master
-      - 'PP-*'
       - 'CURA-*'
+      - 'PP-*'
       - 'NP-*'
       - '[0-9].[0-9]*'
+      - '[0-9].[0-9][0-9]*'
 
 jobs:
-  conan-recipe-version:
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
+# FIXME: Use main once merged
+  conan-package:
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
     with:
       project_name: fdm_materials
-
-  conan-package-export-linux:
-    needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
-    with:
-      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-      recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
+      platform_windows: false
+      platform_mac: false
     secrets: inherit
diff --git a/.github/workflows/notify_on_print_profile_change.yml b/.github/workflows/notify_on_print_profile_change.yml
deleted file mode 100644
index d03552f1a..000000000
--- a/.github/workflows/notify_on_print_profile_change.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: notify_on_print_profile_change
-
-on:
-  push:
-    branches: [ "master" ]
-    paths:
-        - 'generic**'
-        - 'ultimaker**'
-  pull_request:
-    branches: [ "master" ]
-    paths:
-        - 'generic**'
-        - 'ultimaker**'
-jobs:
-    slackNotification:
-        name: Slack Notification
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Cura resources changed
-                uses: rtCamp/action-slack-notify@v2
-                env:
-                    SLACK_CHANNEL: profile-changes
-                    SLACK_USERNAME: ${{ github.repository }}
-                    SLACK_COLOR: '#006400'
-                    SLACK_TITLE: Print profiles changed
-                    MSG_MINIMAL: commit
-                    SLACK_WEBHOOK: ${{ secrets.SLACK_CURA_PPM_HOOK }}
\ No newline at end of file
diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt
deleted file mode 100644
index 77d8d389a..000000000
--- a/.github/workflows/requirements-conan-package.txt
+++ /dev/null
@@ -1 +0,0 @@
-conan

From b536b77921084fef0e14e56774f56fdaec226949 Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Wed, 18 Sep 2024 11:04:46 +0200
Subject: [PATCH 3/6] Remove obsolete workflow

---
 .github/workflows/release.yml | 44 -----------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index fc8e930e9..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-name: Release
-on:
-  push:
-    tags:
-    - "**jedi**"
-
-env:
-  IMAGE_BASE: docker.pkg.github.com/${{ github.repository }}
-  GITHUB_TOKEN: ${{ secrets.GitHub_PAT }}
-  PACKAGE_REPO_GIT: https://ultimaker-package:${{ secrets.GitHub_PAT }}@github.com/Ultimaker/jedi-package-repository.git
-  PACKAGE_REPO_BRANCH: "master master-next_som"
-  GIT_AUTHOR_NAME: embedded
-  GIT_AUTHOR_EMAIL: embedded@ultimaker.com
-  GIT_COMMITTER_NAME: embedded
-  GIT_COMMITTER_EMAIL: embedded@ultimaker.com
-  EMAIL: embedded@ultimaker.com
-
-stages:
-  - validate
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: true # 'recursive' 'true' or 'false'
-        token: ${{ secrets.GitHub_PAT }} # `GitHub_PAT` is a secret contains your PAT.
-
-    - run: echo "${GITHUB_TOKEN}" | docker login -u fdm_materials-c3po --password-stdin docker.pkg.github.com
-    - run: docker run -i -u "$(id -u)" -v "$(pwd):/source" --rm -e CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DEMBEDDED=ON" registry.gitlab.com/ultimaker/stardust/print-cluster-jedi-scripts/print-cluster-jedi-scripts-cmake:latest
-
-    - name: Get the version
-      id: get_version
-      run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: "fdm_materials-${{ steps.get_version.outputs.VERSION }}_all"
-        path: "./fdm_materials-${{ steps.get_version.outputs.VERSION }}_all.deb"
-
-    - run: docker run -i -u "$(id -u)" -v "$(pwd):/source" --rm -e PACKAGE_REPO_GIT -e PACKAGE_REPO_BRANCH -e RELEASE_VERSION="${GITHUB_REF/refs\/tags\//}" -e GIT_AUTHOR_NAME -e GIT_AUTHOR_EMAIL -e GIT_COMMITTER_NAME -e GIT_COMMITTER_EMAIL -e EMAIL -e ARTIFACT_PATH="/source/fdm_materials-${{ steps.get_version.outputs.VERSION }}_all" registry.gitlab.com/ultimaker/stardust/print-cluster-jedi-scripts/print-cluster-jedi-scripts-cmake:latest /push_artifacts.sh

From ccfe0c7b27629da4eab11342513c9d37f44b1d0b Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Wed, 18 Sep 2024 14:48:51 +0200
Subject: [PATCH 4/6] Don't install system dependencies

---
 .github/workflows/conan-package.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index 582c486f4..4a74a3880 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -27,4 +27,5 @@ jobs:
       project_name: fdm_materials
       platform_windows: false
       platform_mac: false
+      install_system_dependencies: false
     secrets: inherit

From 96275637c8f8c6f1dc96223c2368181be18cd502 Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Wed, 25 Sep 2024 15:29:22 +0200
Subject: [PATCH 5/6] Update variable name

---
 .github/workflows/conan-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index 4a74a3880..ee58094d3 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -24,7 +24,7 @@ jobs:
   conan-package:
     uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
     with:
-      project_name: fdm_materials
+      package_name: fdm_materials
       platform_windows: false
       platform_mac: false
       install_system_dependencies: false

From 13d941e71800b7da2bbdeb13d35088903f33f7bd Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Tue, 26 Nov 2024 12:51:16 +0100
Subject: [PATCH 6/6] Use simplified package creation workflow

---
 .github/workflows/conan-package.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index ee58094d3..ac1581c7c 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -24,7 +24,6 @@ jobs:
   conan-package:
     uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
     with:
-      package_name: fdm_materials
       platform_windows: false
       platform_mac: false
       install_system_dependencies: false