Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1848 from nodiscc/build-yarnpkg

Browse source 
build: use the yarnpkg command instead of yarn
This commit is contained in:
nodiscc 2022-04-06 17:38:24 +00:00 committed by GitHub
commit 026ed40d90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -70,10 +70,10 @@ jobs:
node-version: '14.x' node-version: '14.x'
- name: Yarn install - name: Yarn install
run: yarn install run: yarnpkg install
- name: Verify successful frontend builds - name: Verify successful frontend builds
run: yarn run build run: yarnpkg run build
- name: JS static analysis - name: JS static analysis
run: make eslint run: make eslint

4
Dockerfile
View file

@ -20,8 +20,8 @@ RUN cd shaarli \
FROM node:12-alpine as node FROM node:12-alpine as node
COPY --from=composer /app/shaarli shaarli COPY --from=composer /app/shaarli shaarli
RUN cd shaarli \ RUN cd shaarli \
&& yarn install \ && yarnpkg install \
&& yarn run build \ && yarnpkg run build \
&& rm -rf node_modules && rm -rf node_modules
# Stage 4: # Stage 4:

4
Dockerfile.armhf
View file

@ -22,8 +22,8 @@ FROM arm32v6/alpine:3.10 as node
COPY --from=composer /app/shaarli /shaarli COPY --from=composer /app/shaarli /shaarli
RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
&& cd /shaarli \ && cd /shaarli \
&& yarn install \ && yarnpkg install \
&& yarn run build \ && yarnpkg run build \
&& rm -rf node_modules && rm -rf node_modules
# Stage 4: # Stage 4:

12
Makefile
View file

@ -106,11 +106,11 @@ composer_dependencies: clean
### download 3rd-party frontend libraries ### download 3rd-party frontend libraries
frontend_dependencies: frontend_dependencies:
yarn install yarnpkg install
### Build frontend dependencies ### Build frontend dependencies
build_frontend: frontend_dependencies build_frontend: frontend_dependencies
yarn run build yarnpkg run build
### generate a release tarball and include 3rd-party dependencies and translations ### generate a release tarball and include 3rd-party dependencies and translations
release_tar: composer_dependencies htmldoc translate build_frontend release_tar: composer_dependencies htmldoc translate build_frontend
@ -169,10 +169,10 @@ translate:
### Run ESLint check against Shaarli's JS files ### Run ESLint check against Shaarli's JS files
eslint: eslint:
@yarn run eslint -c .dev/.eslintrc.js assets/vintage/js/ @yarnpkg run eslint -c .dev/.eslintrc.js assets/vintage/js/
@yarn run eslint -c .dev/.eslintrc.js assets/default/js/ @yarnpkg run eslint -c .dev/.eslintrc.js assets/default/js/
@yarn run eslint -c .dev/.eslintrc.js assets/common/js/ @yarnpkg run eslint -c .dev/.eslintrc.js assets/common/js/
### Run CSSLint check against Shaarli's SCSS files ### Run CSSLint check against Shaarli's SCSS files
sasslint: sasslint:
@yarn run stylelint --config .dev/.stylelintrc.js 'assets/default/scss/*.scss' @yarnpkg run stylelint --config .dev/.stylelintrc.js 'assets/default/scss/*.scss'