Skip to content

Commit

Permalink
Fix runner version and upgrade runner dependencies (#1042)
Browse files Browse the repository at this point in the history
- Updates version for runner
- Removes top-level redundant files
- Adds npm dependency upgrades for runner

---------
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
prasadtalasila authored Nov 6, 2024
1 parent 9c2c5ea commit 4b01a7c
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 105 deletions.
10 changes: 6 additions & 4 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,17 @@ plugins:
enabled: false

exclude_patterns:
- "**.txt"
- "**.json"
- "**.txt"
- ".pylintrc"
- servers/lib/src/types.ts
- "**/api/"
- "**/build/"
- "**/coverage/"
- "**/dist/"
- "**/node_modules/"
- "**/public/"
- client/config/
- servers/lib/src/types.ts
- "**/script/"
- "client/config/"
- "deploy/config/client/env*.js"
- .pylintrc
- "files/"
13 changes: 0 additions & 13 deletions .eslintignore

This file was deleted.

1 change: 1 addition & 0 deletions deploy/services/services.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/node
/* Install the optional platform services for DTaaS */
/* eslint-disable no-console */
import {$} from 'execa';
import chalk from 'chalk';
import fs from 'fs';
Expand Down
4 changes: 4 additions & 0 deletions servers/execution/runner/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ replaced with _options_ in the names of test files.

## :package: :ship: NPM package

The package version is hardcoded as `PACKAGE_VERSION: string` in
[CLI code](src/config/commander.ts). This package version needs to be
same as `version` in `package.json`.

### Github Package Registry

The Github actions workflow of
Expand Down
4 changes: 2 additions & 2 deletions servers/execution/runner/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -41,7 +41,7 @@
"@nestjs/cli": "^10.4.5",
"@nestjs/schematics": "^10.2.3",
"@nestjs/testing": "^10.4.6",
"@swc/cli": "^0.4.0",
"@swc/cli": "^0.5.0",
"@swc/core": "^1.7.40",
"@types/express": "^5.0.0",
"@types/jest": "^29.5.14",
Expand Down
5 changes: 3 additions & 2 deletions servers/execution/runner/src/config/commander.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()];
Expand All @@ -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()
Expand Down
160 changes: 80 additions & 80 deletions servers/execution/runner/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -980,10 +980,10 @@
dependencies:
"@sinonjs/commons" "^3.0.0"

"@swc/cli@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@swc/cli/-/cli-0.4.0.tgz#8f55091d660f24977f62dabcf5d3649505cd0eb0"
integrity sha512-4JdVrPtF/4rCMXp6Q1h5I6YkYZrCCcqod7Wk97ZQq7K8vNGzJUryBv4eHCvqx5sJOJBrbYm9fcswe1B0TygNoA==
"@swc/cli@^0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@swc/cli/-/cli-0.5.0.tgz#9bb515304abbced57c406c54f4ddc3a53999f8ad"
integrity sha512-eFsrNt85SbHTeX6svpBNcA5DQLP/wrSyCs3KVZjbuEHWD7JGpajZOIwH74lVhyrmrXOcGxgbnxXEbDIfRlLcSw==
dependencies:
"@mole-inc/bin-wrapper" "^8.0.1"
"@swc/counter" "^0.1.3"
Expand All @@ -995,84 +995,84 @@
slash "3.0.0"
source-map "^0.7.3"

"@swc/core-darwin-arm64@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.40.tgz#1e51a2e6c360d5839c30006583ba4e5d42d77927"
integrity sha512-LRRrCiRJLb1kpQtxMNNsr5W82Inr0dy5Imho+4HQzVx/Ismi0qX4hQBgzJAnyOBNLK1+OBVb/912UVhKXppdfQ==

"@swc/core-darwin-x64@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.7.40.tgz#a79ef324618ebde757bb21ba06751f06f026b822"
integrity sha512-Lpl0XK/4fLzS5jsK48opUuGXrqJXwqJckYYPwyGbCfCXm4MsBe+7dX2hq/Kc4YMY25+NeTmzAXhla8TT4WYD/g==

"@swc/core-linux-arm-gnueabihf@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.7.40.tgz#81da8373a5fac134a21f2b06070d1921742e301e"
integrity sha512-4bEvvjptpoc5BRPr/R419h6fXTEuub+frpxxlxBOEKxgXjAF/S3xdxyPijUAakmW/xXBF0u7OC4KYI+38yQp6g==

"@swc/core-linux-arm64-gnu@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.7.40.tgz#33b13bf2251de47c694ac554f189a3bfebfc09f9"
integrity sha512-v2fBlHJ/6Ovz0L2xFAI9TRiKyl9DTdx139PuAHD9gyzp16Utl/W0MPd4t2cYdkI6hPXE9PsJCSzMOrduh+YoDg==

"@swc/core-linux-arm64-musl@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.7.40.tgz#9bd2bd051081e75be1af7dc56fcbb8e6ab4042f7"
integrity sha512-uMkduQuU4LFVkW6txv8AVArT8GjJVJ5IHoWloXaUBMT447iE8NALmpePdZWhMyj6KV7j0y23CM5rzV/I2eNGLg==

"@swc/core-linux-x64-gnu@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.40.tgz#384fa2578f0f5bfc5022884004654919034dbea9"
integrity sha512-4LZdY1MBSnXyTpW5fpBU/+JGAhkuHT+VnFTDNegRboN5nSPh7y0Yvn4LmIioESV+sWzjKkEXujJPGjrp+oSp5w==

"@swc/core-linux-x64-musl@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.40.tgz#49464ad222234620c7b15e8ee755efcca1822a90"
integrity sha512-FPjOwT3SgI6PAwH1O8bhOGBPzuvzOlzKeCtxLaCjruHJu9V8KKBrMTWOZT/FJyYC9mX5Ip1+l9j30UqUZdQxtA==

"@swc/core-win32-arm64-msvc@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.7.40.tgz#eca19f24bb5997d0cb22655fca533b7b35fc141e"
integrity sha512-//ovXdD9GsTmhPmXJlXnIbRQkeuL6PSrYSr7uCMNcclrUdJG0YkO0GMM2afUKYbdJcunylDDWsSS8PFWn0QxmA==

"@swc/core-win32-ia32-msvc@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.7.40.tgz#92affe2556ee1bdb576263dcc2f42192991d735a"
integrity sha512-iD/1auVhHGlhWAPrWmfRWL3w4AvXIWGVXZiSA109/xnRIPiHKb/HqqTp/qB94E/ZHMPRgLKkLTNwamlkueUs8g==

"@swc/core-win32-x64-msvc@1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.7.40.tgz#4fe5405f8a16db5bb4222fa6ba34856ecb053fcc"
integrity sha512-ZlFAV1WFPhhWQ/8esiygmetkb905XIcMMtHRRG0FBGCllO+HVL5nikUaLDgTClz1onmEY9sMXUFQeoPtvliV+w==
"@swc/core-darwin-arm64@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.8.0.tgz#4dc9e0918c9c2907f670fdb101f35574d4024892"
integrity sha512-TIus1/SE/Ud4g84hCnchcagu+LfyndSDy5r5qf64nflojejDidPU9Fp1InzQhQpEgIpntnZID/KFCP5rQnvsIw==

"@swc/core-darwin-x64@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.8.0.tgz#ff06624452ee9081735671f5bed93fb776c5524e"
integrity sha512-yCb1FHCX/HUmNRGB1X3CFJ1WPKXMosZVUe3K2TrosCGvytwgaLoW5FS0bZg5Qv6cEUERQBg75cJnOUPwLLRCVg==

"@swc/core-linux-arm-gnueabihf@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.8.0.tgz#2c093ff8733fbc10804e3fe74ddb1252740ad0d3"
integrity sha512-6TdjVdiLaSW+eGiHKEojMDlx673nowrPHa6nM6toWgRzy8tIZgjPOguVKJDoMnoHuvO7SkOLCUiMRw0rTskypA==

"@swc/core-linux-arm64-gnu@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.8.0.tgz#70e0772a29be00b80e381a528262b1a846a47a1b"
integrity sha512-TU2YcTornnyZiJUabRuk7Xtvzaep11FwK77IkFomjN9/Os5s25B8ea652c2fAQMe9RsM84FPVmX303ohxavjKQ==

"@swc/core-linux-arm64-musl@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.8.0.tgz#651647747f820f4667ad926c965b396bb82122fa"
integrity sha512-2CdPTEKxx2hJIj/B0fn8L8k2coo/FDS95smzXyi2bov5FcrP6Ohboq8roFBYgj38fkHusXjY8qt+cCH7yXWAdg==

"@swc/core-linux-x64-gnu@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.8.0.tgz#745a3113bc48ee867631a77bb239ec598a2fc8f2"
integrity sha512-14StQBifCs/AMsySdU95OmwNJr9LOVqo6rcTFt2b7XaWpe/AyeuMJFxcndLgUewksJHpfepzCTwNdbcYmuNo6A==

"@swc/core-linux-x64-musl@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.8.0.tgz#547c8176971cd1c3746d9d5feda3bacf2f95074a"
integrity sha512-qemJnAQlYqKCfWNqVv5SG8uGvw8JotwU86cuFUkq35oTB+dsSFM3b83+B1giGTKKFOh2nfWT7bvPXTKk+aUjew==

"@swc/core-win32-arm64-msvc@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.8.0.tgz#363340f0fcb0d9e7b9e6d4167171ae64be0a114d"
integrity sha512-fXt5vZbnrVdXZzGj2qRnZtY3uh+NtLCaFjS2uD9w8ssdbjhbDZYlJCj2JINOjv35ttEfAD2goiYmVa5P/Ypl+g==

"@swc/core-win32-ia32-msvc@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.8.0.tgz#95ce2aecbe794e6357214b44bac6d5d1ad296bcc"
integrity sha512-W4FA2vSJ+bGYiTj6gspxghSdKQNLfLMo65AH07u797x7I+YJj8amnFY/fQRlroDv5Dez/FHTv14oPlTlNFUpIw==

"@swc/core-win32-x64-msvc@1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.8.0.tgz#2b31cb9db381d6863727190bb4b1a7be7ce78ce8"
integrity sha512-Il4y8XwKDV0Bnk0IpA00kGcSQC6I9XOIinW5egTutnwIDfDE+qsD0j+0isW5H76GetY3/Ze0lVxeOXLAUgpegA==

"@swc/core@^1.7.40":
version "1.7.40"
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.7.40.tgz#f77fee1fb1f4ab4446fd54e2ea282a46dfa49070"
integrity sha512-0HIzM5vigVT5IvNum+pPuST9p8xFhN6mhdIKju7qYYeNuZG78lwms/2d8WgjTJJlzp6JlPguXGrMMNzjQw0qNg==
version "1.8.0"
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.8.0.tgz#ae9290e6d138abc7c3d6b50fe5223d3c601f9155"
integrity sha512-EF8C5lp1RKMp3426tAKwQyVbg4Zcn/2FDax3cz8EcOXYQJM/ctB687IvBm9Ciej1wMcQ/dMRg+OB4Xl8BGLBoA==
dependencies:
"@swc/counter" "^0.1.3"
"@swc/types" "^0.1.13"
"@swc/types" "^0.1.14"
optionalDependencies:
"@swc/core-darwin-arm64" "1.7.40"
"@swc/core-darwin-x64" "1.7.40"
"@swc/core-linux-arm-gnueabihf" "1.7.40"
"@swc/core-linux-arm64-gnu" "1.7.40"
"@swc/core-linux-arm64-musl" "1.7.40"
"@swc/core-linux-x64-gnu" "1.7.40"
"@swc/core-linux-x64-musl" "1.7.40"
"@swc/core-win32-arm64-msvc" "1.7.40"
"@swc/core-win32-ia32-msvc" "1.7.40"
"@swc/core-win32-x64-msvc" "1.7.40"
"@swc/core-darwin-arm64" "1.8.0"
"@swc/core-darwin-x64" "1.8.0"
"@swc/core-linux-arm-gnueabihf" "1.8.0"
"@swc/core-linux-arm64-gnu" "1.8.0"
"@swc/core-linux-arm64-musl" "1.8.0"
"@swc/core-linux-x64-gnu" "1.8.0"
"@swc/core-linux-x64-musl" "1.8.0"
"@swc/core-win32-arm64-msvc" "1.8.0"
"@swc/core-win32-ia32-msvc" "1.8.0"
"@swc/core-win32-x64-msvc" "1.8.0"

"@swc/counter@^0.1.3":
version "0.1.3"
resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==

"@swc/types@^0.1.13":
version "0.1.13"
resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.13.tgz#441734f8bfa6e9e738f1c68e98be6da282ecc7db"
integrity sha512-JL7eeCk6zWCbiYQg2xQSdLXQJl8Qoc9rXmG2cEKvHe3CKwMHwHGpfOb8frzNLmbycOo6I51qxnLnn9ESf4I20Q==
"@swc/types@^0.1.14":
version "0.1.14"
resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.14.tgz#0a0a3f60f801c5d7d52ab02fd5f924d9c6dbcb0d"
integrity sha512-PbSmTiYCN+GMrvfjrMo9bdY+f2COnwbdnoMw7rqU/PI5jXpKjxOGZ0qqZCImxnT81NkNsKnmEpvu+hRXLBeCJg==
dependencies:
"@swc/counter" "^0.1.3"

Expand Down Expand Up @@ -1253,9 +1253,9 @@
integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==

"@types/node@*", "@types/node@^22.8.1":
version "22.8.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.1.tgz#b39d4b98165e2ae792ce213f610c7c6108ccfa16"
integrity sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==
version "22.8.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.6.tgz#e8a0c0871623283d8b3ef7d7b9b1bfdfd3028e22"
integrity sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==
dependencies:
undici-types "~6.19.8"

Expand Down Expand Up @@ -2901,9 +2901,9 @@ execa@^5.0.0:
strip-final-newline "^2.0.0"

execa@^9.5.0:
version "9.5.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-9.5.0.tgz#b4437553fdd084f65184b5537a9bc38eac26c59a"
integrity sha512-t7vvYt+oKnMbF3O+S5+HkylsPrsUatwJSe4Cv+4017R0MCySjECxnVJ2eyDXVD/Xpj5H29YzyYn6eEpugG7GJA==
version "9.5.1"
resolved "https://registry.yarnpkg.com/execa/-/execa-9.5.1.tgz#ab9b68073245e1111bba359962a34fcdb28deef2"
integrity sha512-QY5PPtSonnGwhhHDNI7+3RvY285c7iuJFFB+lU+oEzMY/gEGJ808owqJsrr8Otd1E/x07po1LkUBmdAc5duPAg==
dependencies:
"@sindresorhus/merge-streams" "^4.0.0"
cross-spawn "^7.0.3"
Expand Down Expand Up @@ -4357,9 +4357,9 @@ keyv@^4.0.0, keyv@^4.5.4:
json-buffer "3.0.1"

keyv@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.1.2.tgz#554772806cbc0b50fed378cb4f21cea7c3bcc8c5"
integrity sha512-gOWSYwaPJsBNB8r+ptJDHLgyw7C7YPeta3gDHfn9kEYMgWNGqw2m+GOvfl6V2CsaiuNfxd1LFz7pnXD5KsFU3w==
version "5.1.3"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.1.3.tgz#9471f0c086ca346e648825953b6f16bd903ac062"
integrity sha512-qWefZgq3GByWFTQgn+C9U7iaHe+mwAVb1utqbna15ggTO5RiLSL91NY+5liTgzchAhGhI6MOn5NVVn/eR1FkPA==
dependencies:
"@keyv/serialize" "*"

Expand Down
4 changes: 0 additions & 4 deletions yarn.lock

This file was deleted.

0 comments on commit 4b01a7c

Please sign in to comment.