Merge origin/master into dev and resolve conflicts in release.yml

This commit is contained in:
peoplemiau1
2026-06-02 13:06:15 +03:00
2 changed files with 5 additions and 3 deletions

View File

@@ -744,6 +744,7 @@ jobs:
git commit -m "dcr-bin ${{ needs.setup.outputs.version }}"
git push -u origin master
# ── Arch User Repository (dcr-dev) ────────────────────────────────
publish-aur-dev:
if: ${{ (github.event_name == 'push' && needs.setup.outputs.prerelease == 'true') || github.event.inputs.run_aur_dev == 'true' }}
@@ -978,6 +979,7 @@ jobs:
git commit -m "dcr-dev-bin ${{ needs.setup.outputs.version }}"
git push -u origin master
# ── crates.io ──────────────────────────────────────────────────────────────
publish-crates:
if: |

View File

@@ -106,7 +106,7 @@ cargo install dcr
<td>
```sh
curl -fsSL https://dcr.dexoron.su/install.sh | bash
curl -fsSL https://dcr.dexoron.su/install.sh | sh
```
</td>
@@ -116,7 +116,7 @@ curl -fsSL https://dcr.dexoron.su/install.sh | bash
<td>
```sh
curl -fsSL https://dcr.dexoron.su/install_bsd.sh | bash
curl -fsSL https://dcr.dexoron.su/install_bsd.sh | sh
```
</td>