From ae25dbbbc45a3a90b2045c85af47ffd4cb22d7f7 Mon Sep 17 00:00:00 2001 From: DistractionRectangle <48034372+DistractionRectangle@users.noreply.github.com> Date: Thu, 26 Jun 2025 22:18:16 -0700 Subject: [PATCH 1/3] chore: update .devcontainer to provide a reproducible build environment (#5558) --- .devcontainer/devcontainer.json | 20 ++++++++++++++++++-- .devcontainer/postCreateCommand.sh | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100755 .devcontainer/postCreateCommand.sh diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index db1eed38d..f42828b31 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,20 @@ { - "name": "jan", - "image": "node:20" + "name": "Jan", + "image": "mcr.microsoft.com/devcontainers/base:jammy", + "features": { + "ghcr.io/devcontainers/features/node:1": { + "version": "20" + }, + "ghcr.io/devcontainers/features/rust:1": {}, + "ghcr.io/devcontainers-extra/features/corepack:1": {} + }, + + "postCreateCommand": "./.devcontainer/postCreateCommand.sh", + + // appimagekit requires fuse to package appimage, to use fuse in the container you need to enable it on the host + "runArgs": [ + "--device", "/dev/fuse", + "--cap-add=SYS_ADMIN", + "--security-opt", "apparmor:unconfined" + ] } diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh new file mode 100755 index 000000000..79fb4de1c --- /dev/null +++ b/.devcontainer/postCreateCommand.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# install tauri prerequisites + xdg-utils for xdg-open + libfuse2 for using appimagekit + +sudo apt update +sudo apt install -yqq libwebkit2gtk-4.1-dev \ + build-essential \ + curl \ + wget \ + file \ + libxdo-dev \ + libssl-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ + xdg-utils \ + libfuse2 + +sudo mkdir -p /opt/bin +sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /opt/bin/appimagetool +sudo chmod +x /opt/bin/appimagetool \ No newline at end of file From 239f93e48d4addf3bc0ca04120fe8544309831e0 Mon Sep 17 00:00:00 2001 From: Nguyen Ngoc Minh <91668012+Minh141120@users.noreply.github.com> Date: Fri, 27 Jun 2025 13:09:19 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20update=20issue=20te?= =?UTF-8?q?mplate=20(#5572)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update label feature request * chore: remove labels type bug --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 - .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index be0f34319..940383f72 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,6 +1,5 @@ name: "\U0001F41B Bug Report" description: "If something isn't working as expected \U0001F914" -labels: [ "type: bug" ] title: 'bug: [DESCRIPTION]' body: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index b1a10e856..8e7fb4ca7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,7 +1,7 @@ name: "\U0001F680 Feature Request" description: "Suggest an idea for this project \U0001F63B!" title: 'idea: [DESCRIPTION]' -labels: 'type: feature request' +labels: 'feature request' body: - type: textarea validations: From 242fbcd43e87087b99dfa19e5bc3d3741c57e433 Mon Sep 17 00:00:00 2001 From: Sam Hoang Van Date: Fri, 27 Jun 2025 13:27:25 +0700 Subject: [PATCH 3/3] chore: update mise.toml configuration (#5556) --- mise.toml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mise.toml b/mise.toml index ea6d3e65b..9f6cee5c7 100644 --- a/mise.toml +++ b/mise.toml @@ -24,13 +24,7 @@ run = [ [tasks.install] description = "Install dependencies" depends = ["config-yarn"] -run = ''' -#!/usr/bin/env bash -# Skip install on Windows per Makefile logic -if [[ "$OSTYPE" != "msys" && "$OSTYPE" != "win32" ]]; then - yarn install -fi -''' +run = "yarn install" sources = ['package.json', 'yarn.lock'] outputs = ['node_modules']