Merge branch 'master' into developer

Author: Alexander Bainczyk

.github/workflows/release.yml

@@ -1,30 +1,31 @@
 name: Release
 
 on:
-  release:
-    types: [created]
+  workflow_dispatch:
 
 jobs:
   release-cli-to-npm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v1
+      - name: Setup NodeJS
+        uses: actions/setup-node@v1
         with:
           node-version: 14
           registry-url: https://registry.npmjs.org/
-      - run: cd cli
-      - run: npm ci
-      - run: npm publish
+
+      - name: Publish CLI
+        run: cd cli && npm ci && npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
 
   tag-docker-images:
     runs-on: ubuntu-latest
     steps:
       - name: Login to GitHub Container Registry
-        run: echo "${{ inputs.password }}" | docker login https://ghcr.io -u ${{ inputs.username }} --password-stdin
+        run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Tag latest images with release version
         run: |
@@ -34,9 +35,7 @@ jobs:
           for img in $IMAGES
           do
             echo "ghcr.io/learnlib/alex/$img:$VERSION"
-            docker pull "ghcr.io/learnlib/alex/$img:unstable"
-            docker tag "ghcr.io/learnlib/alex/$img:unstable" "ghcr.io/learnlib/alex/$img:$VERSION"
-            docker tag "ghcr.io/learnlib/alex/$img:unstable" "ghcr.io/learnlib/alex/$img:latest"
+            docker pull "ghcr.io/learnlib/alex/$img:latest"
+            docker tag "ghcr.io/learnlib/alex/$img:latest" "ghcr.io/learnlib/alex/$img:$VERSION"
             docker push "ghcr.io/learnlib/alex/$img:$VERSION"
-            docker push "ghcr.io/learnlib/alex/$img:latest"
           done

README.md

@@ -1,5 +1,8 @@
+![master branch ci](https://github.com/learnlib/alex/actions/workflows/ci.yml/badge.svg?branch=master)
+![version](https://img.shields.io/badge/version-v2.1.0-blue)
+
 <p align="center">
-    <img src="backend/src/main/resources/images/logo.png" style="max-width:100%;">
+  <img src="backend/src/main/resources/images/logo.png" style="max-width:40%;">
 </p>
 
 # ALEX
@@ -15,17 +18,21 @@ an automaton model (a [Mealy machine][mealy]), which represents the behavior of
 
 To run ALEX, install the following software on your machine:
 
-- [Docker][docker]
-- [Docker Compose][docker-compose]
+For **Linux / OSX**
+* Docker (v20.10.\*) and 
+* Docker Compose (v1.28.*) 
+
+For **Windows 10**
+* Docker for Windows
 
 
 ## Installation
 
 ### Production
 
-1. [Download](https://github.com/LearnLib/alex/releases/latest) the `docker-compose.deploy.yml` file for the latest version.
-2. Run `docker-compose -f docker-compose.deploy.yml pull` once.
-3. Run `docker-compose -f docker-compose.deploy.yml up`.
+1. [Download](https://github.com/LearnLib/alex/releases/latest) the `docker-compose.alex-2.1.0.yml` file.
+2. Run `docker-compose -f docker-compose.alex-2.1.0.yml pull` once.
+3. Run `docker-compose -f docker-compose.alex-2.1.0.yml up`.
 4. Open `127.0.0.1` in a web browser to access the frontend.
 
 **Services**
@@ -63,7 +70,7 @@ Email: *admin@alex.example* <br>
 Password: *admin*
 
 
-## Further links
+## Further reading
 
 ### Documentation
 
@@ -74,8 +81,10 @@ Password: *admin*
 ### Background
 
 * [Active automata learning](https://scholar.google.de/scholar?hl=de&q=active+automata+learning)
+* [ALEX: Mixed-Mode Learning of Web Applications at Ease](https://link.springer.com/chapter/10.1007/978-3-319-47169-3_51)
+
 
-### Used libraries
+## Used libraries
 
 * [LearnLib][learnlib]
 * [AutomataLib][automatalib]

cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:14
 WORKDIR /root/workdir
 COPY . .
 # The project is packed first to prevent the working directory from simply

docs/.vuepress/public/files/todomvc-react.project.json

@@ -499,6 +499,7 @@
   ],
   "tests": [
     {
+      "id": 1,
       "name": "asd",
       "preSteps": [],
       "steps": [
@@ -564,6 +565,7 @@
       "type": "case"
     }
   ],
+  "testExecutionConfigs": [],
   "formulaSuites": [],
   "learnerSetups": [
     {

infrastructure/helm-chart/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: unstable
+appVersion: 2.1.0