From 07cadae5006432b6494eea0797193109a4462895 Mon Sep 17 00:00:00 2001 From: André Oliveira <37463445+SpecialAro@users.noreply.github.com> Date: Sun, 28 Jan 2024 10:07:15 +0000 Subject: Remove python references and MSVS (#94) * Remove python references and MSVS * add back python references * Resurrecting doc for python; Upgrade version of recipes submodule --------- Co-authored-by: Vijay A --- package.json | 1 + recipes | 2 +- scripts/build-unix.sh | 9 ++++----- scripts/build-windows.ps1 | 39 +++------------------------------------ 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index a47b9c8..afebb33 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "prepare": "is-ci || husky install", "dev": "cross-env-shell ENV_PATH=.env.development node ace serve --watch", "migrate": "cross-env-shell ENV_PATH=.env.development node ace migration:run", + "refresh": "cross-env-shell ENV_PATH=.env.development node ace migration:refresh", "status": "cross-env-shell ENV_PATH=.env.development node ace migration:status", "build": "node ace build --production", "start": "cross-env-shell ENV_PATH=.env node build/server.js", diff --git a/recipes b/recipes index 3f3e7be..f6c31f0 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 3f3e7be9487380694e008d1342a0163bd2e80daf +Subproject commit f6c31f00415ad0f0933f07eb3a3f23f4e4cf8804 diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index 94720aa..f9e020d 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh @@ -112,12 +112,11 @@ popd pnpm i pnpm prepare pnpm lint -# TODO: Uncomment after fixing tests -# pnpm test +pnpm test # ----------------------------------------------------------------------------- -printf "\n*************** Building app ***************\n" -node ace migration:refresh -pnpm start --dev +printf "\n*************** Starting app ***************\n" +pnpm refresh +pnpm dev printf "\n*************** App successfully stopped! ***************\n" diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index 71b27b8..c22e033 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 @@ -100,38 +100,6 @@ if ([System.Version]$ACTUAL_PYTHON_VERSION -ne [System.Version]$EXPECTED_PYTHON_ expected: [$EXPECTED_PYTHON_VERSION] actual : [$ACTUAL_PYTHON_VERSION]" } - -# Check MSVS Tools through MSVS_VERSION -$EXPECTED_MSVST_VERSION = @("2019","2022") -$NPM_CONFIG_MSVS_VERSION = npm config get msvs_version -if((-not $NPM_CONFIG_MSVS_VERSION) -or -not ($EXPECTED_MSVST_VERSION -contains $NPM_CONFIG_MSVS_VERSION)){ - Write-Host "Your Microsoft Visual Studio Tools isn't set properly or it's not the right version! - Checking your version..." - - # TODO: Implement path for ARM machines - $MSVS_REG_PATH = "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\X64" - - if(-not (Test-Path -Path $MSVS_REG_PATH)){ - fail_with_docs "You don't have the Microsoft Visual Studio Tools installed!" - } - - $MSVS_VERSION = [int]((Get-ItemProperty -Path $MSVS_REG_PATH).Version.substring(4, 2)) - switch($MSVS_VERSION) { - { $MSVS_VERSION -ge 30 } {$ACTUAL_MSVST_VERSION = "2022"} - { ($MSVS_VERSION -ge 20) -and ($MSVS_VERSION -le 29) } {$ACTUAL_MSVST_VERSION = "2019"} - { $MSVS_VERSION -lt 20 } {$ACTUAL_MSVST_VERSION = "2017 or lower"} - } - - if (-not ($EXPECTED_MSVST_VERSION -contains $ACTUAL_MSVST_VERSION)) { - fail_with_docs "You are not running the expected version of MSVS Tools! - expected: [$EXPECTED_MSVST_VERSION] - actual : [$ACTUAL_MSVST_VERSION]" - } - - Write-Host "Changing your msvs_version on npm to [$ACTUAL_MSVST_VERSION]" - npm config set msvs_version $ACTUAL_MSVST_VERSION -} - # Check pnpm version $EXPECTED_PNPM_VERSION = (Get-Content .\recipes\package.json | ConvertFrom-Json).engines.pnpm $ACTUAL_PNPM_VERSION = Get-Command pnpm --version -ErrorAction SilentlyContinue # in case the pnpm executable itself is not present @@ -162,12 +130,11 @@ Pop-Location & pnpm i & pnpm prepare & pnpm lint -# TODO: Uncomment after fixing tests -# & pnpm test +& pnpm test # ----------------------------------------------------------------------------- Write-Host "*************** Starting app ***************" -& node ace migration:refresh -& pnpm start --dev +& pnpm refresh +& pnpm dev Write-Host "*************** App successfully stopped! ***************" -- cgit v1.2.3-54-g00ecf