diff options
-rw-r--r-- | .github/workflows/builds.yml | 6 | ||||
-rw-r--r-- | Dockerfile | 3 | ||||
-rwxr-xr-x | scripts/build-unix.sh | 3 | ||||
-rw-r--r-- | scripts/build-windows.ps1 | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 1c0035090..9e58978c2 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -149,7 +149,7 @@ jobs: | |||
149 | - name: Install node dependencies | 149 | - name: Install node dependencies |
150 | run: npm i | 150 | run: npm i |
151 | - name: Package recipes | 151 | - name: Package recipes |
152 | run: pnpm i && pnpm package | 152 | run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
153 | working-directory: ./recipes | 153 | working-directory: ./recipes |
154 | - name: Run linter and tests | 154 | - name: Run linter and tests |
155 | run: npm run lint && npm run test | 155 | run: npm run lint && npm run test |
@@ -239,7 +239,7 @@ jobs: | |||
239 | run: echo "PACKAGE_VERSION=$(node -p 'require("./package.json").version')" >> $GITHUB_ENV | 239 | run: echo "PACKAGE_VERSION=$(node -p 'require("./package.json").version')" >> $GITHUB_ENV |
240 | shell: bash | 240 | shell: bash |
241 | - name: Package recipes | 241 | - name: Package recipes |
242 | run: pnpm i && pnpm package | 242 | run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
243 | working-directory: ./recipes | 243 | working-directory: ./recipes |
244 | - name: Run linter and tests | 244 | - name: Run linter and tests |
245 | run: npm run lint && npm run test | 245 | run: npm run lint && npm run test |
@@ -347,7 +347,7 @@ jobs: | |||
347 | max_attempts: 3 | 347 | max_attempts: 3 |
348 | retry_on: error | 348 | retry_on: error |
349 | - name: Package recipes | 349 | - name: Package recipes |
350 | run: pnpm i && pnpm package | 350 | run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
351 | working-directory: ./recipes | 351 | working-directory: ./recipes |
352 | shell: bash | 352 | shell: bash |
353 | - name: Run linter and tests | 353 | - name: Run linter and tests |
diff --git a/Dockerfile b/Dockerfile index b5cf664e6..daff1c54d 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -30,8 +30,7 @@ WORKDIR /usr/src/ferdium/recipes | |||
30 | 30 | ||
31 | RUN npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v | 31 | RUN npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v |
32 | 32 | ||
33 | RUN pnpm i \ | 33 | RUN pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
34 | && pnpm package | ||
35 | 34 | ||
36 | WORKDIR /usr/src/ferdium | 35 | WORKDIR /usr/src/ferdium |
37 | 36 | ||
diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index 602197f7d..15e9f26c8 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh | |||
@@ -116,8 +116,7 @@ $BASE_CMD run prepare-code | |||
116 | printf "\n*************** Building recipes ***************\n" | 116 | printf "\n*************** Building recipes ***************\n" |
117 | # Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm | 117 | # Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm |
118 | pushd recipes | 118 | pushd recipes |
119 | pnpm i | 119 | pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
120 | pnpm package | ||
121 | popd | 120 | popd |
122 | 121 | ||
123 | # ----------------------------------------------------------------------------- | 122 | # ----------------------------------------------------------------------------- |
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index a8c1787a1..d0c394647 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 | |||
@@ -170,8 +170,7 @@ else | |||
170 | Write-Host "*************** Building recipes ***************" | 170 | Write-Host "*************** Building recipes ***************" |
171 | # Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm | 171 | # Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm |
172 | Push-Location recipes | 172 | Push-Location recipes |
173 | pnpm i | 173 | pnpm i && pnpm lint && pnpm reformat-files && pnpm package |
174 | pnpm package | ||
175 | Pop-Location | 174 | Pop-Location |
176 | 175 | ||
177 | # ----------------------------------------------------------------------------- | 176 | # ----------------------------------------------------------------------------- |