Skip to content

Commit

Permalink
remove update (eclipse-velocitas#76)
Browse files Browse the repository at this point in the history
* remove update

* fix licenses and actions
  • Loading branch information
MP91 committed Jan 29, 2024
1 parent 3bdf47c commit 58a64a6
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Clone License Check Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: eclipse-velocitas/license-check
ref: v1.2.3
Expand All @@ -63,7 +63,7 @@ jobs:
java -jar dash.jar clearlydefined.input -summary DEPENDENCIES
- name: Upload dash input/output as artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: "dash-artifacts"
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: "Check Conan package"
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: install prerequisites
run: |
Expand All @@ -52,16 +52,15 @@ jobs:
exit -1
fi
build-and-publish:
runs-on: ubuntu-22.04
name: "Build, Test and Lint"
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Clone vehicle_model repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: eclipse-velocitas/vehicle-model-cpp
path: "./app/vehicle_model"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-build-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
6 changes: 3 additions & 3 deletions NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
|idna|3.6|BSD|
|Jinja2|3.1.3|New BSD|
|lxml|5.1.0|New BSD|
|MarkupSafe|2.1.3|New BSD|
|MarkupSafe|2.1.4|New BSD|
|node-semver|0.6.1|MIT|
|nodeenv|1.8.0|BSD|
|patch-ng|1.17.4|MIT|
Expand All @@ -39,9 +39,9 @@
## Workflows
| Dependency | Version | License |
|:-----------|:-------:|--------:|
|actions/checkout|v3|MIT License|
|actions/checkout|v4|MIT License|
|actions/setup-java|v1.4.4|MIT License|
|actions/upload-artifact|v3|MIT License|
|actions/upload-artifact|v4|MIT License|
|ASzc/change-string-case-action|v5|ISC License|
|docker/build-push-action|v5|Apache License 2.0|
|docker/login-action|v2|Apache License 2.0|
Expand Down
4 changes: 2 additions & 2 deletions install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function print_help() {
Installs the Conan dependencies of the Vehicle App AND the Vehicle App SDK
into the local Conan cache. Has to be re-executed whenever any conanfile.txt
or conanfile.py is updated. By default, dependencies are installed in release
mode.
mode.
Arguments:
-d, --debug Installs all dependencies in debug mode.
Expand Down Expand Up @@ -113,7 +113,7 @@ fi
# Enable Conan revision handling to enable pinning googleapis recipe revision (see conanfile.py)
export CONAN_REVISIONS_ENABLED=1

conan install --update \
conan install \
-pr:h .conan/profiles/linux_${HOST_ARCH}_${BUILD_VARIANT} \
${XCOMPILE_PROFILE} \
--build "${WHICH_DEPS_TO_BUILD}" \
Expand Down

0 comments on commit 58a64a6

Please sign in to comment.