Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ jobs:
run: |
gsutil cp "gs://releases.coder.com/coder-desktop/mac/appcast.xml" ./oldappcast.xml
pushd scripts/update-appcast
swift run update-appcast \
swift run --disable-automatic-resolution update-appcast \
-i ../../oldappcast.xml \
-s ../../build/out/Coder-Desktop.pkg.sig \
-v "$(../version.sh)" \
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ playground.xcworkspace
Packages/
Package.pins
Package.resolved
# The lockfiles are tracked. The Makefile copies the app's into the generated Xcode project.
!/Coder-Desktop/Package.resolved
!/scripts/update-appcast/Package.resolved
*.xcodeproj
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
Expand Down
17 changes: 17 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ make
This will use **XcodeGen** to create the required Xcode project files.
The configuration for the project is defined in `Coder-Desktop/project.yml`.

### Changing Swift Packages

The package versions the app is built with are recorded in
`Coder-Desktop/Package.resolved`. CI and release builds use exactly those
versions, and fail if the file does not match `project.yml`. After adding,
removing or updating a package in `project.yml`, run:

```bash
make lockfile
```

and commit the updated `Package.resolved` with your change.

The release tooling in `scripts/update-appcast` has its own
`Package.resolved`. Update it with `swift package resolve` in that directory.

## Common Make Commands

Here are some useful `make` commands for working with the project:
Expand All @@ -94,6 +110,7 @@ Here are some useful `make` commands for working with the project:
- `make test`: Run all tests using `xcodebuild`.
- `make clean`: Clean the Xcode project.
- `make proto`: Generate Swift files from protobufs.
- `make lockfile`: Update `Package.resolved` after changing packages.
- `make help`: Display all available `make` commands with descriptions.

For continuous development, you can also use:
Expand Down
338 changes: 338 additions & 0 deletions Coder-Desktop/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading