mirror of
https://github.com/dexoron/dcr.git
synced 2026-10-21 15:20:51 +00:00
Merge origin/master into dev and resolve conflicts in release.yml
This commit is contained in:
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -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: |
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
Reference in New Issue
Block a user