mirror of
				https://github.com/suyiiyii/nonebot-bison.git
				synced 2025-11-04 21:44:52 +08:00 
			
		
		
		
	👷 将自动化工具中的 yarn 替换为 pnpm
This commit is contained in:
		
							parent
							
								
									cf6b7fcd6d
								
							
						
					
					
						commit
						bd81449534
					
				@ -4,7 +4,7 @@
 | 
				
			|||||||
  "features": {
 | 
					  "features": {
 | 
				
			||||||
    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
 | 
					    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && yarn install",
 | 
					  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && npm install -g pnpm && pnpm install",
 | 
				
			||||||
  "customizations": {
 | 
					  "customizations": {
 | 
				
			||||||
    "vscode": {
 | 
					    "vscode": {
 | 
				
			||||||
      "settings": {
 | 
					      "settings": {
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/actions/build-docs/action.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/actions/build-docs/action.yml
									
									
									
									
										vendored
									
									
								
							@ -10,5 +10,5 @@ runs:
 | 
				
			|||||||
    - name: Build Frontend
 | 
					    - name: Build Frontend
 | 
				
			||||||
      shell: bash
 | 
					      shell: bash
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        yarn install
 | 
					        pnpm install
 | 
				
			||||||
        yarn docs:build
 | 
					        pnpm docs:build
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/actions/build-frontend/action.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/actions/build-frontend/action.yml
									
									
									
									
										vendored
									
									
								
							@ -11,5 +11,5 @@ runs:
 | 
				
			|||||||
      shell: bash
 | 
					      shell: bash
 | 
				
			||||||
      working-directory: ./admin-frontend
 | 
					      working-directory: ./admin-frontend
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        yarn install
 | 
					        pnpm install
 | 
				
			||||||
        yarn build
 | 
					        pnpm build
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										13
									
								
								.github/actions/setup-node/action.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								.github/actions/setup-node/action.yml
									
									
									
									
										vendored
									
									
								
							@ -8,11 +8,16 @@ runs:
 | 
				
			|||||||
      with:
 | 
					      with:
 | 
				
			||||||
        node-version: "20"
 | 
					        node-version: "20"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - id: yarn-cache-dir-path
 | 
					    - name: Set Up Pnpm
 | 
				
			||||||
      run: echo "::set-output name=dir::$(yarn cache dir)"
 | 
					      uses: https://git.dsvision.net/actions/pnpm-setup@v2
 | 
				
			||||||
 | 
					      with:
 | 
				
			||||||
 | 
					        version: 9.10.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - id: pnpm-cache-dir-path
 | 
				
			||||||
 | 
					      run: echo "::set-output name=dir::$(pnpm store path)"
 | 
				
			||||||
      shell: bash
 | 
					      shell: bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/cache@v4
 | 
					    - uses: actions/cache@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
 | 
					        path: ${{ steps.pnpm-cache-dir-path.outputs.dir }}
 | 
				
			||||||
        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 | 
					        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,8 @@
 | 
				
			|||||||
FROM node:20.17.0 as frontend
 | 
					FROM node:20.17.0 as frontend
 | 
				
			||||||
ADD . /app
 | 
					ADD . /app
 | 
				
			||||||
WORKDIR /app/admin-frontend
 | 
					WORKDIR /app/admin-frontend
 | 
				
			||||||
RUN yarn && yarn build
 | 
					RUN npm install -g pnpm
 | 
				
			||||||
 | 
					RUN pnpm install && pnpm build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM python:3.11
 | 
					FROM python:3.11
 | 
				
			||||||
RUN python3 -m pip install poetry && poetry config virtualenvs.create false
 | 
					RUN python3 -m pip install poetry && poetry config virtualenvs.create false
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user