From 726bb882cb002eeadc0b049ce622351865f98da7 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 12 Sep 2024 14:15:40 -0400 Subject: [PATCH 1/4] Add github action to codespell master on push and PRs --- .github/workflows/codespell.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/codespell.yml diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml new file mode 100644 index 0000000..b026c85 --- /dev/null +++ b/.github/workflows/codespell.yml @@ -0,0 +1,25 @@ +# Codespell configuration is within .codespellrc +--- +name: Codespell + +on: + push: + branches: [master] + pull_request: + branches: [master] + +permissions: + contents: read + +jobs: + codespell: + name: Check for spelling errors + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Annotate locations with typos + uses: codespell-project/codespell-problem-matcher@v1 + - name: Codespell + uses: codespell-project/actions-codespell@v2 From 9e87c6fa046043987e803a788e73e6e59fa26c5f Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 12 Sep 2024 14:15:40 -0400 Subject: [PATCH 2/4] Add rudimentary codespell config --- .codespellrc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .codespellrc diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 0000000..1cd4cac --- /dev/null +++ b/.codespellrc @@ -0,0 +1,6 @@ +[codespell] +# Ref: https://github.com/codespell-project/codespell#using-a-config-file +skip = .git*,.codespellrc +check-hidden = true +# ignore-regex = +# ignore-words-list = From 0f9cb5d55eb892e755fec58ffafeb227e5139390 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 12 Sep 2024 14:18:50 -0400 Subject: [PATCH 3/4] Some more codespell ignores --- .codespellrc | 3 ++- conty-start.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.codespellrc b/.codespellrc index 1cd4cac..94d66c6 100644 --- a/.codespellrc +++ b/.codespellrc @@ -2,5 +2,6 @@ # Ref: https://github.com/codespell-project/codespell#using-a-config-file skip = .git*,.codespellrc check-hidden = true -# ignore-regex = +# Ignore lines with codespell-ignore +ignore-regex = .*codespell-ignore.*|\.fo\b # ignore-words-list = diff --git a/conty-start.sh b/conty-start.sh index aaa5830..aa1b3f0 100755 --- a/conty-start.sh +++ b/conty-start.sh @@ -968,7 +968,7 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@ line="${line} (Conty)" elif [ "${line_function}" = "Exec" ]; then line="Exec=${variables}\"${script}\" $@ $(echo "${line}" | tail -c +6)" - elif [ "${line_function}" = "TryE" ]; then + elif [ "${line_function}" = "TryE" ]; then # pragma: codespell-ignore continue fi From fe0a6ea08bdd4739ba7b9357c77cab687e93bf63 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 12 Sep 2024 14:18:53 -0400 Subject: [PATCH 4/4] [DATALAD RUNCMD] run codespell throughout fixing typos automagically === Do not change lines below === { "chain": [], "cmd": "codespell -w", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^ --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2225e5..cca7390 100644 --- a/README.md +++ b/README.md @@ -388,7 +388,7 @@ There are a few ways to update Conty and get the latest packages, use whichever ### Manual -1. Obtain Arch Linux boostrap by using `create-arch-bootstrap.sh`. Before running it, you can edit the script if you want , for example, to include a different set of packages inside the container, or to include additional locales. Make sure you have enough free disk space, i recommend at least 10 GB of free space. Root rights are required for this step. +1. Obtain Arch Linux bootstrap by using `create-arch-bootstrap.sh`. Before running it, you can edit the script if you want , for example, to include a different set of packages inside the container, or to include additional locales. Make sure you have enough free disk space, i recommend at least 10 GB of free space. Root rights are required for this step. ``` # ./create-arch-bootstrap.sh @@ -511,7 +511,7 @@ $ WINEFSYNC=1 ./conty.sh wine someapplication.exe For example, if the version of your Nvidia kernel module is 460.56 and the libraries inside the container are from 460.67 version, then you won't be able to run graphical applications. There are three solutions to this problem: - * The first and the easiest solution is to use the `NVIDIA_HANDLER` feature of Conty, it will automatically download and pass the appropriate driver version into the container. In the latest verison of Conty this feature is enabled by default and should fix the problem automatically. It hasn't been extensively tested yet, so if it does not work for you, i would appreciate it if you could leave a feedback [here](https://github.com/Kron4ek/Conty/discussions/74), mentioning your Linux distro and Nvidia driver version. + * The first and the easiest solution is to use the `NVIDIA_HANDLER` feature of Conty, it will automatically download and pass the appropriate driver version into the container. In the latest version of Conty this feature is enabled by default and should fix the problem automatically. It hasn't been extensively tested yet, so if it does not work for you, i would appreciate it if you could leave a feedback [here](https://github.com/Kron4ek/Conty/discussions/74), mentioning your Linux distro and Nvidia driver version. * The second solution is to install the same driver version as included inside Conty, which is usually the latest non-beta version. You can see the exact driver version in pkg_list.txt attached to each Conty release. Of course if your GPU is not supported by new drivers, this is not an option for you. * The third solution is to (re)build Conty and include the same driver version as installed on your system. Read the [How to create your own Conty executables](#how-to-create-your-own-conty-executables) section, you will need to edit the `create-arch-bootstrap.sh` script or use the `enter-chroot.sh` script to include a different driver version. For instance, if you want to include legacy 470xx or 390xx drivers, edit the `create-arch-bootstrap.sh` script and replace `nvidia-utils` and `lib32-nvidia-utils` with `nvidia-470xx-utils` and `lib32-nvidia-470xx-utils` (replace 470xx with 390xx if you need 390xx drivers) in the `video_pkgs` variable, and then build Conty following the instructions. * Some Windows applications running under Wine complain about lack of free disk space. This is because under Conty root partition is seen as full and read-only, so some applications think that there is no free space, even though you might have plenty of space in your HOME. The solution is simple, just run `winecfg`, move to "Drives" tab and add your `/home` as an additional drive (for example, `D:`), and then install applications to that drive. More info [here](https://github.com/Kron4ek/Conty/issues/67#issuecomment-1460257910).