From 9cea5e0732d34f53f3dc4b07e537d881a4344960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wieczorek?= Date: Sun, 29 Dec 2024 15:31:03 +0100 Subject: [PATCH] Remove redundant newlines, add .idea to gitignore * Add .idea/ to git ignored directories. * Remove redundant newline. * Remove redundant newline. * Remove redundant newlines. * Remove redundant newline. * Remove redundant newline. * Add missing newline at end of file. * Remove redundant newline. * Remove redundant newlines. --- .cirrus.yml | 5 ----- .gitignore | 3 +++ CODE_OF_CONDUCT.md | 1 - Dockerfile | 1 - benchmarks/benchmarks/load_completions.fish | 1 - build_tools/osx_package_resources/welcome.html | 1 - deny.toml | 2 +- docker/focal-arm64.Dockerfile | 1 - docker/jammy-armv7-32bit.Dockerfile | 1 - docker/jammy.Dockerfile | 1 - osx/fish_debug.entitlements | 1 - 11 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6318f4043..812dce123 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,7 +20,6 @@ linux_task: # container: # <<: *step # image: ghcr.io/krobelus/fish-ci/focal-32bit:latest - tests_script: # cirrus at times gives us 32 procs and 2 GB of RAM # Unrestriced parallelism results in OOM @@ -30,7 +29,6 @@ linux_task: - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=6 .. - ninja -j 6 fish - ninja fish_run_tests - only_if: $CIRRUS_REPO_OWNER == 'fish-shell' linux_arm_task: @@ -41,7 +39,6 @@ linux_arm_task: - name: jammy-armv7-32bit arm_container: image: ghcr.io/fish-shell/fish-ci/jammy-armv7-32bit - tests_script: # cirrus at times gives us 32 procs and 2 GB of RAM # Unrestriced parallelism results in OOM @@ -52,7 +49,6 @@ linux_arm_task: - ninja -j 6 fish - file ./fish - ninja fish_run_tests - # CI task disabled during RIIR transition only_if: false && $CIRRUS_REPO_OWNER == 'fish-shell' @@ -92,5 +88,4 @@ freebsd_task: - sudo -u fish-user -s cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=1 .. - sudo -u fish-user sh -c '. $HOME/.cargo/env; ninja -j 6 fish' - sudo -u fish-user sh -c '. $HOME/.cargo/env; ninja fish_run_tests' - only_if: $CIRRUS_REPO_OWNER == 'fish-shell' diff --git a/.gitignore b/.gitignore index a55c179e8..aa6270650 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,6 @@ target/ # Generated by clangd /.cache + +# JetBrains editors. +.idea/ diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 8b0bfcda6..382d8471b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -126,4 +126,3 @@ enforcement ladder](https://github.com/mozilla/diversity). For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations. - diff --git a/Dockerfile b/Dockerfile index 7e4803008..0aa272068 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,4 +16,3 @@ WORKDIR /src RUN cmake3 . &&\ make &&\ make install - diff --git a/benchmarks/benchmarks/load_completions.fish b/benchmarks/benchmarks/load_completions.fish index 504dcb47f..23fa26f11 100644 --- a/benchmarks/benchmarks/load_completions.fish +++ b/benchmarks/benchmarks/load_completions.fish @@ -8,5 +8,4 @@ for file in *.fish echo FAILING FILE $file end end - end diff --git a/build_tools/osx_package_resources/welcome.html b/build_tools/osx_package_resources/welcome.html index 9e6078b45..549a1d280 100644 --- a/build_tools/osx_package_resources/welcome.html +++ b/build_tools/osx_package_resources/welcome.html @@ -8,7 +8,6 @@ code, tt { font-family: ui-monospace, Menlo, monospace; } - diff --git a/deny.toml b/deny.toml index 54e754997..9761b05d7 100644 --- a/deny.toml +++ b/deny.toml @@ -19,4 +19,4 @@ allow = [ [sources.allow-org] # 1 or more github.com organizations to allow git sources for -github = ["fish-shell"] \ No newline at end of file +github = ["fish-shell"] diff --git a/docker/focal-arm64.Dockerfile b/docker/focal-arm64.Dockerfile index 8bbeda1fb..a57337a83 100644 --- a/docker/focal-arm64.Dockerfile +++ b/docker/focal-arm64.Dockerfile @@ -36,5 +36,4 @@ WORKDIR /home/fishuser COPY fish_run_tests.sh / - CMD /fish_run_tests.sh diff --git a/docker/jammy-armv7-32bit.Dockerfile b/docker/jammy-armv7-32bit.Dockerfile index 6091b1594..220eb8233 100644 --- a/docker/jammy-armv7-32bit.Dockerfile +++ b/docker/jammy-armv7-32bit.Dockerfile @@ -38,5 +38,4 @@ WORKDIR /home/fishuser COPY fish_run_tests.sh / - CMD /fish_run_tests.sh diff --git a/docker/jammy.Dockerfile b/docker/jammy.Dockerfile index 6949ff01b..52180e2c8 100644 --- a/docker/jammy.Dockerfile +++ b/docker/jammy.Dockerfile @@ -35,5 +35,4 @@ WORKDIR /home/fishuser COPY fish_run_tests.sh / - CMD /fish_run_tests.sh diff --git a/osx/fish_debug.entitlements b/osx/fish_debug.entitlements index cc5eb7b01..09e5623cf 100644 --- a/osx/fish_debug.entitlements +++ b/osx/fish_debug.entitlements @@ -6,4 +6,3 @@ -