Skip to content

fix(brand): Homebrew no longer conflicts with itself, and About shows the panda #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rgdevment merged 4 commits into from
Oct 14, 2026
Merged

fix(brand): Homebrew no longer conflicts with itself, and About shows the panda #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
241337b
fix(homebrew): the cask never lists a renamed token among its conflic…
rgdevment Oct 14, 2026
731d3a8
fix(homebrew): conflicts are read from the final rename map, and the …
rgdevment Oct 14, 2026
d047c64
feat(about): the panda stands in for the C beside the name, with the …
rgdevment Oct 14, 2026
19f3b00
build(deps): rustls 0.23.46 closes RUSTSEC-2026-0346 to 0349
rgdevment Oct 14, 2026
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
15 changes: 14 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ jobs:

auto_updates true

conflicts_with cask: ["${CASK_OTHER}", "${FORMER_OTHER}"]
conflicts_with cask: [CONFLICTS]
depends_on macos: :ventura

app "CoPanda.app"
Expand All @@ -1533,6 +1533,11 @@ jobs:
"~/Library/Preferences/com.rgdevment.copypaste.plist",
"~/Library/Saved Application State/com.rgdevment.copypaste.savedState",
]

caveats <<~EOS
CoPanda was called CopyPaste until 3.2. Coming from it, your history,
settings and shortcut carry over, and the app is CoPanda in Applications.
EOS
end
CASK

Expand Down Expand Up @@ -1562,6 +1567,14 @@ jobs:
done
mv /tmp/renames.json cask_renames.json

conflicts=""
for one in "${CASK_OTHER}" "${FORMER_OTHER}"; do
[ -n "$(jq -r --arg one "$one" '.[$one] // empty' cask_renames.json)" ] && continue
[ "$one" = "${CASK_OTHER}" ] || [ -f "Casks/${one}.rb" ] || continue
conflicts="${conflicts:+${conflicts}, }\"${one}\""
done
sed -i "s/\[CONFLICTS\]/[${conflicts}]/" "Casks/${CASK}.rb"

git add Casks cask_renames.json
if git diff --cached --quiet; then
echo "tap already at ${VERSION}"
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions THIRD-PARTY-BUNDLED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ with the crates that carry it.
| `scheduler` | 0.28.0 | MIT |
| `uc.micro` | 3.0.0 | MIT |

## In the core (443 crates)
## In the core (442 crates)

| Crate | Version | Licence |
| --- | --- | --- |
Expand Down Expand Up @@ -142,7 +142,6 @@ with the crates that carry it.
| `futures-util` | 0.3.34 | MIT OR Apache-2.0 |
| `getrandom` | 0.2.17 | MIT OR Apache-2.0 |
| `getrandom` | 0.3.4 | MIT OR Apache-2.0 |
| `getrandom` | 0.4.3 | MIT OR Apache-2.0 |
| `gif` | 0.14.2 | MIT OR Apache-2.0 |
| `glob` | 0.3.4 | MIT OR Apache-2.0 |
| `global-hotkey` | 0.8.0 | Apache-2.0 OR MIT |
Expand Down Expand Up @@ -309,7 +308,7 @@ with the crates that carry it.
| `rusqlite` | 0.40.2 | MIT |
| `rustc-hash` | 1.1.0 | Apache-2.0/MIT |
| `rustix` | 1.1.4 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
| `rustls` | 0.23.45 | Apache-2.0 OR ISC OR MIT |
| `rustls` | 0.23.46 | Apache-2.0 OR ISC OR MIT |
| `rustls-pki-types` | 1.15.1 | MIT OR Apache-2.0 |
| `rustls-platform-verifier` | 0.7.1 | MIT OR Apache-2.0 |
| `rustls-webpki` | 0.103.15 | ISC |
Expand Down
Loading
Loading