update upload action

- install conan under root user
eclipse-velocitas · Jun 21, 2024 · 8e1a3d5 · 8e1a3d5
1 parent d250fd6
commit 8e1a3d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml
@@ -122,7 +122,7 @@ jobs:
           sed -i -e 's/PACKAGE-MANAGER/PACKAGE_MANAGER/g' SBOM/SPDX/*.spdx.json
 
       - name: Upload SBOM as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: SBOM
           path: |

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
@@ -60,7 +60,7 @@ jobs:
           java -jar dash.jar -project automotive.velocitas -review -token ${{ secrets.GITLAB_API_TOKEN }} -summary DEPENDENCIES clearlydefined.input 2> output.log
 
       - name: Upload dash input/output as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: "dash-artifacts"

diff --git a/Dockerfiles/cpp/.devcontainer/Dockerfile b/Dockerfiles/cpp/.devcontainer/Dockerfile
@@ -96,6 +96,9 @@ RUN ./install-python.sh && \
     ./install-velocitas-cli.sh ${TARGETARCH} && \
     ./install-kanto.sh ${TARGETARCH}
 
+# Install conan as root user
+RUN sudo pip3 install conan==1.63.0
+
 USER 4000
 
 ADD --chown=4000 https://raw.githubusercontent.com/eclipse-velocitas/vehicle-app-cpp-sdk/$SDK_TAG/requirements.txt ./requirements/requirements.txt

diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md
@@ -5,7 +5,7 @@
 |:-----------|:-------:|--------:|
 |actions/checkout|v4|MIT License|
 |actions/setup-java|v3.13.0|MIT License|
-|actions/upload-artifact|v3|MIT License|
+|actions/upload-artifact|v4|MIT License|
 |ASzc/change-string-case-action|v6|ISC License|
 |devcontainers/ci|v0.3|MIT License|
 |docker/login-action|v3|Apache License 2.0|