Skip to content

Commit a8aef7f

Browse files
committed
Merge branch 'backport-github-actions-fixes'
The planet keeps revolving, and CI definitions (even old ones) need to be kept up to date, even if they worked unchanged before (because now they don't). Signed-off-by: Johannes Schindelin <[email protected]>
2 parents ff40506 + 83b08eb commit a8aef7f

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,6 @@ jobs:
364364
with:
365365
name: failed-tests-${{matrix.vector.jobname}}
366366
path: ${{env.FAILED_TEST_ARTIFACTS}}
367-
- name: Upload failed tests' directories
368-
if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname == 'linux32'
369-
uses: actions/upload-artifact@v1 # cannot be upgraded because Node.js Actions aren't supported in this container
370-
with:
371-
name: failed-tests-${{matrix.vector.jobname}}
372-
path: ${{env.FAILED_TEST_ARTIFACTS}}
373367
static-analysis:
374368
needs: ci-config
375369
if: needs.ci-config.outputs.enabled == 'yes'

compat/mingw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
void open_in_gdb(void)
3333
{
3434
static struct child_process cp = CHILD_PROCESS_INIT;
35-
extern char *_pgmptr;
3635

3736
strvec_pushl(&cp.args, "mintty", "gdb", NULL);
3837
strvec_pushf(&cp.args, "--pid=%d", getpid());

t/t7300-clean.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
747747
test_must_fail git clean -xdf 2>.git/err &&
748748
# grepping for a strerror string is unportable but it is OK here with
749749
# MINGW prereq
750-
test_grep "too long" .git/err
750+
test_grep -e "too long" -e "No such file or directory" .git/err
751751
'
752752

753753
test_expect_success 'clean untracked paths by pathspec' '

0 commit comments

Comments
 (0)