diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index df250368..f0b66772 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ // Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17 // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local arm64/Apple Silicon. - "VARIANT": "1-1.23-bookworm", + "VARIANT": "1-1.24-bookworm", // Options "NODE_VERSION": "lts/*" } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37a1172c..ee517634 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - name: Setup NodeJS uses: actions/setup-node@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11c8b912..0792282a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - name: Setup NodeJS uses: actions/setup-node@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 36214090..afc0ba39 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - name: Install gotestsum run: go install gotest.tools/gotestsum@latest @@ -49,7 +49,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - name: Create Fake WebUI Sources run: | diff --git a/.gitignore b/.gitignore index 1c079cb1..3d7233f6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ __debug_bin cmd/backrest/backrest *.exe .DS_Store -.idea/ \ No newline at end of file +.idea/ +.pnpm-store/ \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 6893fe39..899027bc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "${workspaceFolder}/backrest.go", + "program": "${workspaceFolder}/cmd/backrest/backrest.go", "output": "__debug_bin", "preLaunchTask": "Build Webui" }, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7301b866..12b49ca6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "npm i", "type": "shell", - "command": "cd webui && npm i" + "command": "cd webui && npx --yes pnpm i" }, { "label": "Parcel",