Fix version in runner and publish npm package

.github/workflows/lib-ms.yml

@@ -140,12 +140,12 @@ jobs:
       node-version: ${{ needs.get_version.outputs.node-version }}
       registry-url: 'https://npm.pkg.github.com/'
       directory: servers/lib
-      package-name: ${{ vars.PACKAGE_NAME || '' }}
+      package-name: ${{ vars.NPM_LIBMS_PACKAGE_NAME || '' }}
     secrets:
       NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-package-npm:
-    if: | 
+    if: |
       (startsWith(github.ref, 'refs/heads/feature/') || startsWith(github.ref, 'refs/heads/release-v'))
 
     name: Publish to NPM
@@ -155,7 +155,7 @@ jobs:
       node-version: ${{ needs.get_version.outputs.node-version }}
       registry-url: 'https://registry.npmjs.org'
       directory: servers/lib
-      package-name: ${{ vars.PACKAGE_NAME || '' }}
+      package-name: ${{ vars.NPM_LIBMS_PACKAGE_NAME || '' }}
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN}}
 

.github/workflows/publish-npm.yml

@@ -54,5 +54,3 @@ jobs:
           yarn install
           yarn build
           yarn publish --access public
-
-

.github/workflows/runner.yml

@@ -9,6 +9,9 @@ on:
       - 'servers/execution/**'
   workflow_dispatch:
 
+env:
+  NODE_VERSION: 20
+
 jobs:
   test-runner:
     name: Test digital twin runner
@@ -24,7 +27,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: ${{ env.NODE_VERSION }}
           cache: "yarn"
           cache-dependency-path: "**/yarn.lock"
 
@@ -51,39 +54,32 @@ jobs:
           files: servers/execution/runner/coverage/clover.xml
           flags: dt-runner
 
-  publish-package:
-
+  publish-package-github:
     if: | 
-      github.event_name == 'push' &&
       (startsWith(github.ref, 'refs/heads/feature/') || startsWith(github.ref, 'refs/heads/release-v'))
 
     name: Publish to GitHub Packages
-    runs-on: ubuntu-latest
-    needs: test-runner
-    permissions:
-      packages: write
-      contents: read
+    needs: [test-runner]
+    uses: ./.github/workflows/publish-npm.yml
+    with:
+      node-version: 20
+      registry-url: 'https://npm.pkg.github.com/'
+      directory: servers/execution/runner
+      package-name: ${{ vars.NPM_RUNNER_PACKAGE_NAME || '' }}
+    secrets:
+      NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: "yarn"
-          cache-dependency-path: "**/yarn.lock"
-          always-auth: true
-          registry-url: 'https://npm.pkg.github.com/'
+  publish-package-npm:
+    if: |
+      (startsWith(github.ref, 'refs/heads/feature/') || startsWith(github.ref, 'refs/heads/release-v'))
 
-      - name: Publish npm package
-        run: |
-          # copy README.md to project root
-          cp servers/execution/runner/README.md .
-          cd servers/execution/runner
-          yarn install
-          yarn build
-          yarn publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+    name: Publish to GitHub Packages
+    needs: [test-runner]
+    uses: ./.github/workflows/publish-npm.yml
+    with:
+      node-version: 20
+      registry-url: 'https://registry.npmjs.org'
+      directory: servers/execution/runner
+      package-name: ${{ vars.NPM_RUNNER_PACKAGE_NAME || '' }}
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN}}

docs/developer/github-actions.md

@@ -1,15 +1,17 @@
 # Secrets for Github Action
 
 The Github actions require the following secrets to be obtained
-from [docker hub](hub.docker.com):
+from [docker hub](hub.docker.com) and [npm](npmjs.com):
 
 | Secret Name | Explanation |
 |:---|:---|
 | `DOCKERHUB_SCOPE` | Username or organization name on docker hub |
 | `DOCKERHUB_USERNAME` | Username on docker hub |
 | `DOCKERHUB_TOKEN` | API token to publish images to docker hub, with `Read`, `Write` and `Delete` permissions |
 | `NPM_TOKEN` | Token to publish npm package to Nodejs registry. |
+| `NPM_LIBMS_PACKAGE_NAME` | Name of npm package for lib microservice |
+| `NPM_RUNNER_PACKAGE_NAME` | Name of npm package for runner microservice |
 
 Remember to add these secrets to
 [Github Secrets Setting](https://docs.github.com/en/actions/security-for-github-actions/security-guides/using-secrets-in-github-actions#creating-secrets-for-a-repository)
-of your fork.
+of your fork.

servers/execution/runner/DEVELOPER.md

@@ -70,3 +70,4 @@ of VS Code IDE. Launch the program using `yarn start` before using
 the **runner.api.http**.
 
 Please see [README](./README.md) for more information.
+

servers/execution/runner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@into-cps-association/runner",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "DT Runner",
   "main": "dist/src/runner.js",
   "repository": "https://github.com/into-cps-association/DTaaS.git",

servers/execution/runner/src/config/commander.ts

@@ -4,7 +4,8 @@ import { readFileSync } from 'fs';
 import Keyv from 'keyv';
 import resolveFile from './util.js';
 
-const PACKAGE_VERSION: string = '0.2.0';
+const PACKAGE_VERSION: string = '0.3.2';
+const DEFAULT_CONFIG_FILENAME = 'runner.yaml';
 
 export function createCommand(name: string): [Command, Keyv] {
   return [new Command(name), new Keyv()];
@@ -20,7 +21,7 @@ export default async function CLI(
     .option(
       '-c --config <string>',
       'runner config file specified in yaml format',
-      'runner.yaml',
+      DEFAULT_CONFIG_FILENAME,
     )
     .helpOption('-h --help', 'display help')
     .showHelpAfterError()

servers/lib/DEVELOPER.md

@@ -162,3 +162,4 @@ yarn publish #increments version, publishes to registry and adds a git tag
 ```bash
 npm unpublish  --registry http://localhost:4873/ @into-cps-association/[email protected]
 ```
+