mirror of
https://github.com/egor-white/zaprett.git
synced 2025-12-10 05:19:42 +05:00
fix workflow
This commit is contained in:
3
.github/workflows/workflow.yml
vendored
3
.github/workflows/workflow.yml
vendored
@@ -150,7 +150,6 @@ jobs:
|
||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||
}
|
||||
EOF
|
||||
<<<<<<< HEAD
|
||||
cat > update-tv.json <<EOF
|
||||
{
|
||||
"version": "${{ inputs.version }}",
|
||||
@@ -159,8 +158,6 @@ jobs:
|
||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||
}
|
||||
EOF
|
||||
=======
|
||||
>>>>>>> origin/rust
|
||||
- name: Commit jsons and changelog
|
||||
if: ${{ inputs.create_release == 'true' }}
|
||||
uses: stefanzweifel/git-auto-commit-action@v5
|
||||
|
||||
Reference in New Issue
Block a user