Skip to content

Commit 86d5038

Browse files
committed
chore: tidy up after the nix removal
Add the mise trust step to CONTRIBUTING.md, fail early on GNU Make older than 3.82, and drop leftover Nix and direnv references.
1 parent ab1c94e commit 86d5038

4 files changed

Lines changed: 18 additions & 11 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
# Created by https://www.toptal.com/developers/gitignore/api/xcode,jetbrains,macos,direnv,swift,swiftpm,objective-c
2-
# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,jetbrains,macos,direnv,swift,swiftpm,objective-c
3-
4-
### direnv ###
5-
.direnv
6-
.envrc
1+
# Created by https://www.toptal.com/developers/gitignore/api/xcode,jetbrains,macos,swift,swiftpm,objective-c
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,jetbrains,macos,swift,swiftpm,objective-c
73

84
### JetBrains ###
95
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
@@ -294,7 +290,7 @@ xcuserdata
294290
**/.vscode/**
295291
buildServer.json
296292

297-
# End of https://www.toptal.com/developers/gitignore/api/xcode,jetbrains,macos,direnv,swift,swiftpm,objective-c
293+
# End of https://www.toptal.com/developers/gitignore/api/xcode,jetbrains,macos,swift,swiftpm,objective-c
298294

299295
*.entitlements
300296
app-signing.keychain-db

‎CONTRIBUTING.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,23 @@ related to missing path setups or other tooling installation problems. For
2727
example, a Homebrew `swiftformat` may format the code differently from CI.
2828

2929
1. [Install mise](https://mise.jdx.dev/installing-mise.html).
30-
2. [Activate mise in your shell](https://mise.jdx.dev/getting-started.html#activate-mise),
31-
so the pinned tools are on your `PATH` whenever you are in the project
32-
directory.
30+
2. From the project directory, [trust](https://mise.jdx.dev/cli/trust.html) its
31+
`mise.toml`. mise asks for this because the file changes mise settings:
32+
33+
```bash
34+
mise trust
35+
```
36+
3337
3. Install the tools:
3438

3539
```bash
3640
mise install
3741
```
3842

43+
4. [Activate mise in your shell](https://mise.jdx.dev/getting-started.html#activate-mise),
44+
so the pinned tools are on your `PATH` whenever you are in the project
45+
directory.
46+
3947
## Generating the Xcode Project Files
4048

4149
Once your development environment is set up, generate the Xcode project files by

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
SHELL := bash
33
.SHELLFLAGS := -ceu
44

5+
ifeq ($(filter oneshell,$(.FEATURES)),)
6+
$(error GNU Make 3.82 or later is required for .SHELLFLAGS, but this is $(MAKE_VERSION). Install the tools with mise, see CONTRIBUTING.md)
7+
endif
8+
59
# This doesn't work on directories.
610
# See https://stackoverflow.com/questions/25752543/make-delete-on-error-for-directory-targets
711
.DELETE_ON_ERROR:

‎scripts/build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
# Add standard Nix environment variables
54
out="${out:-release}"
65
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
76

0 commit comments

Comments
 (0)