Skip to content

Commit

Permalink
Preparing upgrade to v2.1.0-beta1
Browse files Browse the repository at this point in the history
The version changes required for the release of version 2.1.0-beta1 of the three VSCode4Teaching components are introduced in this commit.
  • Loading branch information
diego-guerrero committed Mar 3, 2022
1 parent 1ca4eb9 commit b3de600
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 14 deletions.
29 changes: 23 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ branches:
- master
jobs:
include:
- name: V4T Server
- name: V4T Server (Spring Boot)
language: java
jdk: oraclejdk11
services:
Expand All @@ -15,12 +15,15 @@ jobs:
script:
- "./mvnw clean package -B -q"
after_script:
- cd ..
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build -t vscode4teaching/vscode4teaching:2.0.2 .
- docker build -t vscode4teaching/vscode4teaching:latest .
- docker push vscode4teaching/vscode4teaching:2.0.2
- docker push vscode4teaching/vscode4teaching:latest
- language: node_js
- docker build -t vscode4teaching/vscode4teaching:2.1.0-beta1 .
# Beta version: latest won't be changed until 2.1.0 is released
# - docker build -t vscode4teaching/vscode4teaching:latest .
- docker push vscode4teaching/vscode4teaching:2.1.0-beta1
# - docker push vscode4teaching/vscode4teaching:latest
- name: V4T Extension (Node.js)
language: node_js
os:
- linux
- osx
Expand All @@ -38,6 +41,20 @@ jobs:
- npm test
cache:
npm: false
# WebApp testing temporarily disabled (not ready yet)
#- name: V4T WebApp (Angular)
# language: node_js
# os:
# - linux
# - osx
# node_js: 16.13.2
# before_script:
# - cd ./vscode4teaching-webapp
# - npm install --save-dev
# script:
# - npm test
# cache:
# npm: false
env:
global:
- secure: Xubi//N9TBKtampk7kO3V0rvuhbCIzVJ7ad2oJIoZGVUyCgmt9KdK46jfG2eSUYuvOMKg1xrXia0R0YC+VveoJPiRgCxqNIfqhb605XaY0SLRXAh2cThABs6q3IwFzoFVIG/8/xhZpqSngbystQxm8EflGhYdZYukijqtEEx78VrtuWaPRBcxGBFt8GaaLyzWvy8eY6Fzw4KZntZPHaalLt0t5k+Qt+Dt2AJuUb3YV1IaWyMQIeF0dKM2XLMpUISeRBVzPrqSmRxpbMyR+8iktPY2KYJFmeH1MD8H1imG/OVkHxSRiXsPXkZ8ueqXSzZ1R9cNIR6ZLKRIyo2sMvxRz5Kzr2fhcEtxCtyRW0sXFV4EG7lsUewn9E9MJ7e5OtnwZOKkcIvStydrwd3t9TH+pUdptgVGA+EdL/T4mcIjPkzYWPoUoLn1MYR3YYUezvqsJXrgl4HqQJSSLgaCEso/q/s5+IH+1y4xFYpLNo05+OhMWz0vNCBbPT02VC+6YTQwHAOcGNjOHDwgkwkg1KC46ZMkbdfm4bhNL1oWfAPynuHjNAfinzxc0kE/FataPXVEt7XX+dA3YdQL+KffqKdRLQqDgsQ1ZNvE+oZwJT1NMfIhlsreboBl1C9diQrxfLwaHBZjUXuNpbI6FK8W8iyQvBNfPWvcdKdMmrNdQV7268=
Expand Down
4 changes: 2 additions & 2 deletions vscode4teaching-extension/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 vscode4teaching-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"displayName": "VS Code 4 Teaching",
"description": "Bring the programming exercises directly to the student’s editor.",
"version": "2.0.2",
"version": "2.1.0-beta1",
"engines": {
"vscode": "^1.61.0"
},
Expand Down
4 changes: 2 additions & 2 deletions vscode4teaching-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.9</version>
<version>2.5.10</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<groupId>com.vscode4teaching</groupId>
<artifactId>vscode4teaching-server</artifactId>
<version>2.0.2</version>
<version>2.1.0-beta1</version>
<name>VSCode 4 Teaching</name>
<description>Server side of VSCode 4 Teaching extension.</description>

Expand Down
4 changes: 2 additions & 2 deletions vscode4teaching-webapp/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 vscode4teaching-webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vscode4teaching-webapp",
"version": "2.0.2",
"version": "2.1.0-beta1",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down

0 comments on commit b3de600

Please sign in to comment.