dexoron/dcr
1
1
Fork 0
mirror of https://github.com/dexoron/dcr.git synced 2026-10-21 14:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
peoplemiau1
2026-06-02 13:06:15 +03:00
parent d26e93dd47 35f9b6be94
commit d6ddb5da3d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

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

6
README.md
View File

@@ -106,7 +106,7 @@ cargo install dcr
<td> <td>
```sh ```sh
curl -fsSL https://dcr.dexoron.su/install.sh | bash curl -fsSL https://dcr.dexoron.su/install.sh | sh
``` ```
</td> </td>
@@ -116,7 +116,7 @@ curl -fsSL https://dcr.dexoron.su/install.sh | bash
<td> <td>
```sh ```sh
curl -fsSL https://dcr.dexoron.su/install_bsd.sh | bash curl -fsSL https://dcr.dexoron.su/install_bsd.sh | sh
``` ```
</td> </td>
@@ -259,4 +259,4 @@ cargo test
GPL-3.0 — see [LICENSE](LICENSE)<br/> GPL-3.0 — see [LICENSE](LICENSE)<br/>
Made with ❤️ by [Dexoron](https://github.com/dexoron) and contributors. Made with ❤️ by [Dexoron](https://github.com/dexoron) and contributors.
</div> </div>