Skip to content

Commit

Permalink
github(workflows): bump Ubuntu from 20.04 to 22.04 (#590)
Browse files Browse the repository at this point in the history
This commit also bumps:

- musl from to 1.1.24 to 1.2.2.
- GCC from 10.3 to 11.2 (GCC 12 is not installed by default).

With the configlet 4.0.0-beta.5 (2022-07-02) Linux release binary:

    $ readelf -p .comment configlet

    String dump of section '.comment':
      [     0]  GCC: (Ubuntu 9.2.1-12ubuntu1) 9.2.1 20191022
      [    2d]  GCC: (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0

With a configlet built in the GitHub Actions environment using the
changes in this commit:

    $ readelf -p .comment configlet

    String dump of section '.comment':
      [     0]  GCC: (Ubuntu 11.2.0-7ubuntu2) 11.2.0
      [    25]  GCC: (Ubuntu 11.2.0-19ubuntu1) 11.2.0

Links:

- https://github.com/actions/runner-images/tree/c22e0f8ec89e#github-actions-runner-images
- https://github.com/actions/runner-images/blob/c22e0f8ec89e/images/linux/Ubuntu2204-Readme.md
- https://musl.libc.org/releases.html
- https://git.musl-libc.org/cgit/musl/log/
- https://gcc.gnu.org/gcc-11/changes.html
- https://gcc.gnu.org/releases.html
- https://github.blog/changelog/2022-05-10-github-actions-beta-of-ubuntu-22-04-for-github-hosted-runners-is-now-available/
- https://github.blog/changelog/2022-08-09-github-actions-ubuntu-22-04-is-now-generally-available-on-github-hosted-runners/

Closes: #194
Closes: #568
Closes: #607
  • Loading branch information
ee7 authored Aug 17, 2022
1 parent 121b40e commit 6b6a780
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 12 deletions.
4 changes: 0 additions & 4 deletions .github/bin/linux-install-build-tools
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#!/usr/bin/env sh

# Switch to GCC 10
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100
sudo update-alternatives --set gcc /usr/bin/gcc-10

# Install musl
sudo apt-get install musl-dev musl-tools
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
include:
- target:
os: linux
builder: ubuntu-20.04
builder: ubuntu-22.04
- target:
os: mac
builder: macos-11
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b

- name: On Linux, switch to GCC 10 and install musl
- name: On Linux, install musl
if: matrix.target.os == 'linux'
run: ./.github/bin/linux-install-build-tools

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

checksums:
needs: [build]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Upload checksums file
steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-whitespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
jobs:
lint_whitespace:
name: Lint whitespace
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
jobs:
markdownlint:
name: Lint markdown files
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
jobs:
shellcheck:
name: Run shellcheck on scripts
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
include:
- target:
os: linux
builder: ubuntu-20.04
builder: ubuntu-22.04
- target:
os: mac
builder: macos-11
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b

- name: On Linux, switch to GCC 10 and install musl
- name: On Linux, install musl
if: matrix.target.os == 'linux'
run: ./.github/bin/linux-install-build-tools

Expand Down

0 comments on commit 6b6a780

Please sign in to comment.