From 34805eecc3ffd53d49fe439d353f85913344f0da Mon Sep 17 00:00:00 2001 From: Pascal Garber Date: Sun, 25 Feb 2024 01:04:59 +0100 Subject: [PATCH] fix(github): build:types:gjs -> validate:types:all --- .github/workflows/ci.yml | 4 ++-- .vscode/launch.json | 2 +- package.json | 28 ++++++++++++++-------------- types | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee1ab727f..b5b39ac68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,5 +66,5 @@ jobs: run: sudo apt-get --yes install build-essential gobject-introspection libgirepository1.0-dev libcairo2 libcairo2-dev - run: yarn install - run: yarn run build - - run: NODE_OPTIONS=--max_old_space_size=9216 yarn run build:types:gjs - - run: NODE_OPTIONS=--max_old_space_size=9216 yarn run validate:types:gjs + - run: NODE_OPTIONS=--max_old_space_size=9216 yarn run build:types:all + - run: NODE_OPTIONS=--max_old_space_size=9216 yarn run validate:types:all diff --git a/.vscode/launch.json b/.vscode/launch.json index e54c82687..ae0d80c25 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -77,7 +77,7 @@ "sourceMaps": true, }, { - "name": "build:types:gjs", + "name": "build:types:all", "type": "node", "request": "launch", "cwd": "${workspaceRoot}/packages/cli", diff --git a/package.json b/package.json index 21f3cfb09..1b4f02517 100644 --- a/package.json +++ b/package.json @@ -19,19 +19,19 @@ "publish:types:next": "yarn workspaces foreach -v --all --parallel --no-private --include '@girs/*' npm publish --tolerate-republish --tag next --access public", "publish:types:latest": "yarn workspaces foreach -v --all --parallel --no-private --include '@girs/*' npm publish --tolerate-republish --tag latest --access public", "test": "yarn build:all && yarn test:girs:all && yarn validate:examples && yarn start:cli-examples:all", - "test:girs:all": "yarn clear:types && yarn build:types:all && yarn validate:types:root", - "test:girs:gjs": "yarn clear:types && yarn build:types && yarn validate:types:root", - "test:girs:gjs:vda1": "yarn clear:types && yarn build:types:vda1 && yarn validate:types:root", - "test:girs:gjs:gtk2": "yarn clear:types && yarn build:types:gtk2 && yarn validate:types:root", - "test:girs:gjs:gtk3": "yarn clear:types && yarn build:types:gtk3 && yarn validate:types:root", - "test:girs:gjs:gtk4": "yarn clear:types && yarn build:types:gtk4 && yarn validate:types:root", - "test:girs:gjs:gtk3+gtk4": "yarn clear:types && yarn build:types:gtk3+gtk4 && yarn validate:types:root", - "test:girs:gjs:gio": "yarn clear:types && yarn build:types:gio && yarn validate:types:root", - "test:girs:gjs:vte4": "yarn clear:types && yarn build:types:vte4 && yarn validate:types:root", - "test:girs:gjs:modemmanager1": "yarn clear:types && yarn build:types:modemmanager1 && yarn validate:types:root", - "test:girs:gjs:timezonemap1": "yarn clear:types && yarn build:types:timezonemap1 && yarn validate:types:root", - "test:girs:gjs:rygelcore2": "yarn clear:types && yarn build:types:rygelcore2 && yarn validate:types:root", - "test:girs:gjs:gcalc": "yarn clear:types && yarn build:types:gcalc && yarn validate:types:root", + "test:girs:all": "yarn clear:types && yarn build:types:all && yarn validate:types:all", + "test:girs:gjs": "yarn clear:types && yarn build:types && yarn validate:types:all", + "test:girs:gjs:vda1": "yarn clear:types && yarn build:types:vda1 && yarn validate:types:all", + "test:girs:gjs:gtk2": "yarn clear:types && yarn build:types:gtk2 && yarn validate:types:all", + "test:girs:gjs:gtk3": "yarn clear:types && yarn build:types:gtk3 && yarn validate:types:all", + "test:girs:gjs:gtk4": "yarn clear:types && yarn build:types:gtk4 && yarn validate:types:all", + "test:girs:gjs:gtk3+gtk4": "yarn clear:types && yarn build:types:gtk3+gtk4 && yarn validate:types:all", + "test:girs:gjs:gio": "yarn clear:types && yarn build:types:gio && yarn validate:types:all", + "test:girs:gjs:vte4": "yarn clear:types && yarn build:types:vte4 && yarn validate:types:all", + "test:girs:gjs:modemmanager1": "yarn clear:types && yarn build:types:modemmanager1 && yarn validate:types:all", + "test:girs:gjs:timezonemap1": "yarn clear:types && yarn build:types:timezonemap1 && yarn validate:types:all", + "test:girs:gjs:rygelcore2": "yarn clear:types && yarn build:types:rygelcore2 && yarn validate:types:all", + "test:girs:gjs:gcalc": "yarn clear:types && yarn build:types:gcalc && yarn validate:types:all", "build": "yarn build:parser && yarn build:lib && yarn build:generators && yarn build:cli", "build:parser": "yarn workspace @gi.ts/parser run build", "build:cli": "yarn workspace @ts-for-gir/cli run build", @@ -62,7 +62,7 @@ "validate": "yarn workspaces foreach -v --all --parallel run validate", "validate:types": "yarn workspaces foreach -v --all --parallel run validate:types", "validate:examples": "yarn workspaces foreach -v --all --parallel run validate:app", - "validate:types:root": "NODE_OPTIONS=--max_old_space_size=9216 tsc --project tsconfig.json", + "validate:types:all": "NODE_OPTIONS=--max_old_space_size=9216 tsc --project tsconfig.json", "clear": "yarn clear:build && yarn clear:types", "clear:build": "yarn workspaces foreach -v --include '@ts-for-gir/*' run clear:build", "clear:types": "rimraf ./@types", diff --git a/types b/types index 9104102dc..054ccdc9b 160000 --- a/types +++ b/types @@ -1 +1 @@ -Subproject commit 9104102dcdfc002d86b4ffaac69ff02ed778f503 +Subproject commit 054ccdc9bbe093a4388daa77ed2e4711f94ed8a5