Skip to content

Commit

Permalink
Fix compilation node version conflict in ci (#215)
Browse files Browse the repository at this point in the history
Signed-off-by: Dennis Meister <[email protected]>
  • Loading branch information
dennismeister93 authored Mar 9, 2024
1 parent 2ef8dd4 commit 3b6a762
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 12 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build-exe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ on:
required: false
type: string

env:
NODE_VERSION: 18

jobs:
compile:
strategy:
Expand All @@ -53,7 +56,7 @@ jobs:
uses: docker/setup-qemu-action@v3
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: ${{ env.NODE_VERSION }}

- name: Set version in package.json
run: |
Expand All @@ -71,7 +74,7 @@ jobs:
if: ${{ matrix.arch == 'arm64' }}
uses: uraimo/run-on-arch-action@v2
with:
base_image: arm64v8/node:lts-bullseye
base_image: arm64v8/node:${{ env.NODE_VERSION }}-bullseye
run: |
npm install .
Expand All @@ -81,7 +84,7 @@ jobs:
npm install .
- name: Compile EXE for ${{ matrix.arch }}
run: TARGET=node18-${{ matrix.os }}-${{ matrix.arch }} ARCH=${{ matrix.arch }} OS=${{ matrix.os }} npm run compile-exe
run: TARGET=node${{ env.NODE_VERSION }}-${{ matrix.os }}-${{ matrix.arch }} ARCH=${{ matrix.arch }} OS=${{ matrix.os }} npm run compile-exe
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-${{ matrix.arch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
system-tests:
name: "Run system tests for ${{ matrix.language }}"
runs-on: ubuntu-22.04
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/${{ matrix.language }}:v0.1
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/${{ matrix.language }}:v0.2
strategy:
matrix:
language: ["python", "cpp"]
Expand Down
2 changes: 1 addition & 1 deletion NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
|ts-node|10.9.2|MIT|
|tslib|2.6.2|BSD Zero Clause License|
|typescript|5.4.2|Apache 2.0|
|velocitas-cli|0.6.3|Apache 2.0|
|velocitas-cli|0.0.0|Apache 2.0|
|yaml|2.4.1|ISC|
## Workflows
| Dependency | Version | License |
Expand Down
26 changes: 20 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "velocitas-cli",
"version": "0.6.3",
"version": "0.0.0",
"description": "Lifecycle management of Velocitas Vehicle Applications",
"author": "Eclipse Velocitas Team",
"bin": {
Expand Down

0 comments on commit 3b6a762

Please sign in to comment.