From fb82797ddffc780d8659e077f695f2ee49a6d8d2 Mon Sep 17 00:00:00 2001 From: Nicholas Moen Date: Thu, 28 Sep 2023 21:24:39 -0600 Subject: [PATCH] chore: use simpler strategy for gitignoring misc. files --- .gitignore | 11 +++++------ assets/playwright.config.ts | 2 +- .../scripts/systemd-container-service-file-generate | 2 +- support/scripts/systemd-container-service-teardown | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a0a8b65..4cbae22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ -# misc -*.ignore -*.tmp -gitignore.* - -# dotenv +# environment .env # elixir @@ -16,6 +11,10 @@ __pycache__/ *.sw? Session*.vim +# misc +*.tmp +*gitignored* + # MIX DEFAULTS # # The directory Mix will write compiled artifacts to. diff --git a/assets/playwright.config.ts b/assets/playwright.config.ts index 2e6020a..ca00e68 100644 --- a/assets/playwright.config.ts +++ b/assets/playwright.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ forbidOnly: !!process.env.CI, // fail if `.only()` in tests during CI globalSetup: "tests/e2e/support/setup/global.ts", // globalTeardown: "tests/e2e/support/teardown.ts", - outputDir: "tests/e2e/support/test-results.ignore", + outputDir: "tests/e2e/support/test-results.gitignored", retries: process.env.CI ? 2 : 0, // retry on CI only reporter: "line", testDir: "tests/e2e", diff --git a/support/scripts/systemd-container-service-file-generate b/support/scripts/systemd-container-service-file-generate index 262f668..8f8fd45 100755 --- a/support/scripts/systemd-container-service-file-generate +++ b/support/scripts/systemd-container-service-file-generate @@ -164,7 +164,7 @@ command_to_run="$(which docker-compose) ${maybe_podman_config} $containers_to_ru if [ "$dry_run" != 1 ]; then # create script for managing the container service manually (helps with debugging compose issues) - container_management_script="$working_directory/container-management-script.ignore" + container_management_script="$working_directory/container-management-script.gitignored" printf "\033[96mCreating a container service management helper script: '%s'...\033[39m\n" "$container_management_script" echo "cd $working_directory && $command_to_run \"\$@\"" >"$container_management_script" chmod +x "$container_management_script" diff --git a/support/scripts/systemd-container-service-teardown b/support/scripts/systemd-container-service-teardown index bf260b9..9d04dcf 100755 --- a/support/scripts/systemd-container-service-teardown +++ b/support/scripts/systemd-container-service-teardown @@ -40,4 +40,4 @@ systemctl --user daemon-reload # remove the container management script echo "Removing the manual container management script..." -rm "$(dirname "$0")/../containers/container-management-script.ignore" +rm "$(dirname "$0")/../containers/container-management-script.gitignored"