Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Nevermore-Ray authored and Nevermore-Ray committed Feb 8, 2025
2 parents a2774eb + 7a05592 commit 3c0a25b
Show file tree
Hide file tree
Showing 1,127 changed files with 6,574 additions and 110,673 deletions.
5 changes: 2 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM $BASE_IMAGE

ENV DEBIAN_FRONTEND=noninteractive

# Install pnpm globally and install necessary build tools
# Install bun globally and install necessary build tools
RUN apt-get update \
&& apt-get install -y \
git \
Expand All @@ -16,8 +16,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG PNPM_VER=9.15.2
RUN npm install -g pnpm@${PNPM_VER}
RUN npm install -g bun@$1.2.2

# Set Python 3 as the default python
RUN ln -s /usr/bin/python3 /usr/bin/python
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"build": {
"args": {
"NODE_VER": "23.5.0",
"PNPM_VER": "9.15.2"
"BUN_VER": "1.2.2"
}
},
"privileged": true,
Expand Down
12 changes: 0 additions & 12 deletions .editorconfig

This file was deleted.

Loading

0 comments on commit 3c0a25b

Please sign in to comment.