DuckDuckWhale/org.yuzu_emu.yuzu
1
0
Fork 0
mirror of https://github.com/flathub/org.yuzu_emu.yuzu.git synced 2024-12-16 14:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: bump actions/github-script to v6

Browse Source
This commit is contained in:
liushuyu 2022-10-12 15:44:41 -06:00
parent aa0fa905d6
commit d9393c4ce4
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/auto-merge.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- run: npm install execa@5 - run: npm install execa@5
- uses: actions/github-script@v5 - uses: actions/github-script@v6
name: Check and Merge name: Check and Merge
id: check-changes id: check-changes
with: with:

2
.github/workflows/merge.js vendored
View File

@ -45,7 +45,6 @@ async function incrementVersion() {
} }
async function mergeChanges(branch, execa) { async function mergeChanges(branch, execa) {
let mergeResults = {};
try { try {
const process = await execa("git", [ const process = await execa("git", [
"merge", "merge",
@ -64,6 +63,7 @@ async function mergeChanges(branch, execa) {
console.log( console.log(
`::error title=Merge failed::Failed to merge pull request: ${err}`, `::error title=Merge failed::Failed to merge pull request: ${err}`,
); );
return;
} }
const process = await execa("git", [ const process = await execa("git", [