Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simplifying CI: ubuntu install #750

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

simplifying CI: ubuntu install #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
88b0e06
simplifying CI: ubuntu install
lemire Oct 6, 2024
89f4a45
Update .github/workflows/ubuntu_install.yml
lemire Oct 6, 2024
c3b8b25
Update .github/workflows/ubuntu_install.yml
lemire Oct 6, 2024
6b7a3ae
Update ubuntu_install.yml
lemire Oct 7, 2024
0e44b34
Merge branch 'main' into simplify_ubuntu_install
Nov 18, 2024
2ad2b3e
upgrading to 24.
Nov 18, 2024
fbe840f
let us go with defaults
Nov 18, 2024
f60614c
bumping everything to ubuntu 24
lemire Nov 18, 2024
69c012b
damn it. gcc 11 is the default?
lemire Nov 18, 2024
b3fa9aa
adding installation with clang
lemire Nov 18, 2024
488385b
Merge branch 'main' into simplify_ubuntu_install
lemire Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ubuntu 22.04 (Release build)
name: Ubuntu 24.04 (Release build)

on:
pull_request:
Expand All @@ -22,10 +22,10 @@ concurrency:

jobs:
ubuntu-release-build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
cxx: [g++-12, clang++-14]
cxx: [g++, clang++]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Ninja
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-sanitized.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ubuntu 22.04 (GCC 12 SANITIZED)
name: Ubuntu 24.04 (GCC 12 SANITIZED)

on:
pull_request:
Expand All @@ -22,7 +22,7 @@ concurrency:

jobs:
ubuntu-build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
shared: [ON, OFF]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-undef.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ubuntu 22.04 (GCC 12 SANITIZE UNDEFINED)
name: Ubuntu 24.04 (GCC 12 SANITIZE UNDEFINED)

on:
pull_request:
Expand All @@ -22,7 +22,7 @@ concurrency:

jobs:
ubuntu-build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
shared: [ON, OFF]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ubuntu 22.04
name: Ubuntu 24.04

on:
pull_request:
Expand All @@ -22,11 +22,11 @@ concurrency:

jobs:
ubuntu-build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
shared: [ON, OFF]
cxx: [g++-12, clang++-14]
cxx: [g++-12, clang++]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Ninja
Expand Down
21 changes: 12 additions & 9 deletions .github/workflows/ubuntu_install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@ name: Ubuntu 24.04 (Installation)

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
types:
- opened
- synchronize
- reopened
- ready_for_review
paths-ignore:
- '**.md'
- 'docs/**'
- "**.md"
- docs/**
push:
branches:
- main
paths-ignore:
- '**.md'
- 'docs/**'

- "**.md"
- docs/**
permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
ubuntu-build:
runs-on: ubuntu-24.04
Expand All @@ -39,8 +40,10 @@ jobs:
- name: Install
run: cmake --install build
- name: Prepare test package
run: cmake -DCMAKE_INSTALL_PREFIX:PATH=../../destination -S tests/installation -B buildbabyada
run: cmake -DCMAKE_INSTALL_PREFIX:PATH=../../destination -S tests/installation |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to either pass CC=gcc-12 CXX=g++-12 or do sudo ln -sf /usr/bin/gcc-12 /usr/bin/gcc kind of symlink to fix the issue. Ubuntu 22 doesn't include gcc 12 or something newer

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let us upgrade to ubuntu 24.

Messing around with paths is fragile.

-B buildbabyada
- name: Build test package
run: cmake --build buildbabyada
- name: Run example
run: ./buildbabyada/main

6 changes: 3 additions & 3 deletions .github/workflows/ubuntu_pedantic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ubuntu 22.04 (GCC 12) Fails On Compiler Warnings
name: Ubuntu 24.04 Fails On Compiler Warnings

on:
pull_request:
Expand All @@ -22,7 +22,7 @@ concurrency:

jobs:
ubuntu-build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
shared: [ON, OFF]
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Prepare
run: cmake -D ADA_TESTING=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build
env:
CXX: g++-12
CXX: g++
CXXFLAGS: -Werror
- name: Build
run: cmake --build build -j=4
Expand Down
Loading