Merge branch 'js/ci-github-update-ubuntu'
Adjust to the deprecation of use of Ubuntu 20.04 GitHub Actions CI. * js/ci-github-update-ubuntu: ci: upgrade `sparse` to supported build agents
This commit is contained in:
13
.github/workflows/main.yml
vendored
13
.github/workflows/main.yml
vendored
@@ -448,21 +448,12 @@ jobs:
|
|||||||
if: needs.ci-config.outputs.enabled == 'yes'
|
if: needs.ci-config.outputs.enabled == 'yes'
|
||||||
env:
|
env:
|
||||||
jobname: sparse
|
jobname: sparse
|
||||||
CI_JOB_IMAGE: ubuntu-20.04
|
CI_JOB_IMAGE: ubuntu-22.04
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
concurrency:
|
concurrency:
|
||||||
group: sparse-${{ github.ref }}
|
group: sparse-${{ github.ref }}
|
||||||
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
|
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Download a current `sparse` package
|
|
||||||
# Ubuntu's `sparse` version is too old for us
|
|
||||||
uses: git-for-windows/get-azure-pipelines-artifact@v0
|
|
||||||
with:
|
|
||||||
repository: git/git
|
|
||||||
definitionId: 10
|
|
||||||
artifact: sparse-20.04
|
|
||||||
- name: Install the current `sparse` package
|
|
||||||
run: sudo dpkg -i sparse-20.04/sparse_*.deb
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Install other dependencies
|
- name: Install other dependencies
|
||||||
run: ci/install-dependencies.sh
|
run: ci/install-dependencies.sh
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ StaticAnalysis)
|
|||||||
sparse)
|
sparse)
|
||||||
sudo apt-get -q update -q
|
sudo apt-get -q update -q
|
||||||
sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \
|
sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \
|
||||||
libexpat-dev gettext zlib1g-dev
|
libexpat-dev gettext zlib1g-dev sparse
|
||||||
;;
|
;;
|
||||||
Documentation)
|
Documentation)
|
||||||
sudo apt-get -q update
|
sudo apt-get -q update
|
||||||
|
|||||||
Reference in New Issue
Block a user