]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jx/ci-ubuntu-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2022 01:41:05 +0000 (10:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2022 01:41:06 +0000 (10:41 +0900)
Adjust the GitHub CI to newer ubuntu release.

* jx/ci-ubuntu-fix:
  ci: install python on ubuntu
  ci: use the same version of p4 on both Linux and macOS
  ci: remove the pipe after "p4 -V" to catch errors
  github-actions: run gcc-8 on ubuntu-20.04 image

1  2 
.github/workflows/main.yml
ci/lib.sh

Simple merge
diff --cc ci/lib.sh
Simple merge