Skip to content

Commit

Permalink
CI: switch to ubuntu-22.04 image to avoid timeout (#2730)
Browse files Browse the repository at this point in the history
Since the older ubuntu-20.04 image based runs commonly time-out:
* update to the current ubuntu-22.04 image
* rename scripts to reflect usage of ubuntu-22.04 image
  • Loading branch information
neteler committed Jan 23, 2023
1 parent 10be76c commit 4a68d5a
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/additional_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
additional-checks:
name: Additional checks
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout repository contents
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.10"
black-version: "22.3.0"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
name: ${{ matrix.os }} build

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container: ${{ matrix.os }}
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
analyze:
name: ${{ matrix.language }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
env:
CFLAGS: "-std=gnu11"
CXXFLAGS: "-std=c++11"
run: .github/workflows/build_ubuntu-20.04.sh $HOME/install
run: .github/workflows/build_ubuntu-22.04.sh $HOME/install

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/create_release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checks-out repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
flake8:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
name: ${{ matrix.c }} & ${{ matrix.cpp }}

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -57,4 +57,4 @@ jobs:
CFLAGS: "-std=${{ matrix.c }} -fPIC -Wall"
# TODO: -pedantic-errors here won't compile
CXXFLAGS: "-std=${{ matrix.cpp }} -fPIC -Wall"
run: .github/workflows/build_ubuntu-20.04.sh $HOME/install -Werror
run: .github/workflows/build_ubuntu-22.04.sh $HOME/install -Werror
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.10"
min-python-version: "3.7"
pylint-version: "2.12.2"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
python-version:
- "3.8"
- "3.10"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
strategy:
matrix:
include:
- name: "20.04"
os: ubuntu-20.04
config: ubuntu-20.04
- name: "22.04"
os: ubuntu-22.04
config: ubuntu-22.04
# This is without optional things but it still keeps things useful,
# so, e.g., without OpenMP, but with PDAL. Code or tests should be written
# so that test pass even when these optional things are not present.
- name: "minimum config"
os: ubuntu-20.04
config: ubuntu-20.04_without_x
os: ubuntu-22.04
config: ubuntu-22.04_without_x
fail-fast: false

steps:
Expand Down

0 comments on commit 4a68d5a

Please sign in to comment.