Skip to content

Commit

Permalink
frontend: bump cicd-base-gui image version (#2366)
Browse files Browse the repository at this point in the history
## Why?

The previous version (2.0.0) had outdated toolchain dependencies

## What?

Bump vdk-cicd-base-gui image version to 2.1.2

Downgrade Cypress and angular-cli to 9.7.0 and 13.3.7 respectively.

## How was this tested?

CI

## What kind of change is this?

Feature/non-breaking

Signed-off-by: Dilyan Marinov <[email protected]>
  • Loading branch information
DeltaMichael authored Aug 21, 2023
1 parent a9e2fe5 commit 6c317c9
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions projects/frontend/cicd/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- always

frontend-data-pipelines-build:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
image: "versatiledatakit/vdk-cicd-base-gui:2.1.2"
stage: build
needs:
- job: frontend-shared-components-build
Expand Down Expand Up @@ -59,7 +59,7 @@ frontend-data-pipelines-build:

# TODO: Add the cicd path back to the rule once e2e tests are stabilized
frontend-data-pipelines-e2e-tests:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
image: "versatiledatakit/vdk-cicd-base-gui:2.1.2"
stage: pre_release_test
before_script:
- cd projects/frontend/
Expand All @@ -82,7 +82,7 @@ frontend-data-pipelines-e2e-tests:
expire_in: 1 week

frontend-data-pipelines-release:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
image: "versatiledatakit/vdk-cicd-base-gui:2.1.2"
stage: release
before_script:
- cd projects/frontend/
Expand Down Expand Up @@ -193,7 +193,7 @@ frontend_quickstart_operability_test:
- job: frontend-data-pipelines-build
optional: false
artifacts: true
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
image: "versatiledatakit/vdk-cicd-base-gui:2.1.2"
before_script:
- cd projects/frontend/data-pipelines/gui
script:
Expand Down Expand Up @@ -226,7 +226,7 @@ frontend_publish_test_image:
extends: .frontend_publish_docker_image

frontend-shared-components-build:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
image: "versatiledatakit/vdk-cicd-base-gui:2.1.2"
stage: build
before_script:
- cd projects/frontend/shared-components/gui
Expand All @@ -253,7 +253,7 @@ frontend-shared-components-build:
expire_in: 1 week

frontend-shared-components-release:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
image: "versatiledatakit/vdk-cicd-base-gui:2.1.2"
stage: release
before_script:
- cd projects/frontend/
Expand Down
4 changes: 2 additions & 2 deletions projects/frontend/cicd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN apt-get update && apt-get install -y \
ENV NVM_VERSION=0.39.3
ENV NODE_VERSION=18.12.0
ENV NPM_VERSION=9.7.2
ENV ANGULAR_CLI_VERSION=13.3.11
ENV CYPRESS_VERSION=12.16.0
ENV ANGULAR_CLI_VERSION=13.3.7
ENV CYPRESS_VERSION=9.7.0

# Install nvm for managing nodejs and install nodejs
RUN curl -fsSL -o nvm-install.sh https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh
Expand Down
2 changes: 1 addition & 1 deletion projects/frontend/data-pipelines/gui/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.15.0
18.12.0
4 changes: 2 additions & 2 deletions projects/frontend/data-pipelines/gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "data-pipelines-wrapper",
"version": "0.0.0",
"engines": {
"node": "^14.15.0 || >=16.10.0",
"npm": ">=8.5.5"
"node": "^14.15.0 || >=18.12.0",
"npm": ">=9.7.2"
},
"private": true,
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "@versatiledatakit/data-pipelines",
"version": "0.0.0",
"engines": {
"node": "^14.15.0 || >=16.10.0",
"npm": ">=8.5.5"
"node": "^14.15.0 || >=18.12.0",
"npm": ">=9.7.2"
},
"license": "Apache-2.0",
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion projects/frontend/shared-components/gui/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.15.0
18.12.0
4 changes: 2 additions & 2 deletions projects/frontend/shared-components/gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "shared-wrapper",
"version": "0.0.0",
"engines": {
"node": "^14.15.0 || >=16.10.0",
"npm": ">=8.5.5"
"node": "^14.15.0 || >=18.12.0",
"npm": ">=9.7.2"
},
"private": true,
"scripts": {
Expand Down

0 comments on commit 6c317c9

Please sign in to comment.