diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build-unix.sh | 13 | ||||
-rw-r--r-- | scripts/build-windows.ps1 | 15 |
2 files changed, 12 insertions, 16 deletions
diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index 8dae9e5ee..04aa9e70f 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh | |||
@@ -103,19 +103,18 @@ fi | |||
103 | command_exists asdf && asdf reshim nodejs | 103 | command_exists asdf && asdf reshim nodejs |
104 | 104 | ||
105 | # ----------------------------------------------------------------------------- | 105 | # ----------------------------------------------------------------------------- |
106 | # Now the meat..... | ||
107 | pnpm i | ||
108 | pnpm prepare-code | ||
109 | pnpm lint | ||
110 | pnpm test | ||
111 | |||
112 | # ----------------------------------------------------------------------------- | ||
113 | printf "\n*************** Building recipes ***************\n" | 106 | printf "\n*************** Building recipes ***************\n" |
114 | pushd recipes | 107 | pushd recipes |
115 | pnpm i && pnpm lint && pnpm reformat-files && pnpm package | 108 | pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
116 | popd | 109 | popd |
117 | 110 | ||
118 | # ----------------------------------------------------------------------------- | 111 | # ----------------------------------------------------------------------------- |
112 | # Now the meat..... | ||
113 | pnpm i | ||
114 | pnpm prepare-code | ||
115 | pnpm lint | ||
116 | pnpm test | ||
117 | |||
119 | printf "\n*************** Building app ***************\n" | 118 | printf "\n*************** Building app ***************\n" |
120 | if [[ "$(uname -m)" =~ "arm" ]]; then | 119 | if [[ "$(uname -m)" =~ "arm" ]]; then |
121 | TARGET_ARCH=arm64 | 120 | TARGET_ARCH=arm64 |
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index ca4fabfe8..3c85e0a38 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 | |||
@@ -127,8 +127,6 @@ if((-not $NPM_CONFIG_MSVS_VERSION) -or -not ($EXPECTED_MSVST_VERSION -contains $ | |||
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||
130 | |||
131 | |||
132 | # ----------------------------------------------------------------------------- | 130 | # ----------------------------------------------------------------------------- |
133 | # Ensure that the system dependencies are at the correct version - recover if not | 131 | # Ensure that the system dependencies are at the correct version - recover if not |
134 | # Check pnpm version | 132 | # Check pnpm version |
@@ -148,19 +146,18 @@ if ($ACTUAL_PNPM_VERSION -ne $EXPECTED_RECIPES_PNPM_VERSION) { | |||
148 | } | 146 | } |
149 | 147 | ||
150 | # ----------------------------------------------------------------------------- | 148 | # ----------------------------------------------------------------------------- |
151 | # Now the meat..... | ||
152 | & pnpm i | ||
153 | & pnpm prepare-code | ||
154 | & pnpm lint | ||
155 | & pnpm test | ||
156 | |||
157 | # ----------------------------------------------------------------------------- | ||
158 | Write-Host "*************** Building recipes ***************" | 149 | Write-Host "*************** Building recipes ***************" |
159 | Push-Location recipes | 150 | Push-Location recipes |
160 | pnpm i && pnpm lint && pnpm reformat-files && pnpm package | 151 | pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
161 | Pop-Location | 152 | Pop-Location |
162 | 153 | ||
163 | # ----------------------------------------------------------------------------- | 154 | # ----------------------------------------------------------------------------- |
155 | # Now the meat..... | ||
156 | & pnpm i | ||
157 | & pnpm prepare-code | ||
158 | & pnpm lint | ||
159 | & pnpm test | ||
160 | |||
164 | Write-Host "*************** Building app ***************" | 161 | Write-Host "*************** Building app ***************" |
165 | if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { | 162 | if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { |
166 | $TARGET_ARCH="arm64" | 163 | $TARGET_ARCH="arm64" |