Skip to content

Commit 9a1a3aa

Browse files
authored
Merge pull request #188 from jwillemsen/jwi-depgccruby
Drop support for gcc < 13 and ruby < 3.0
2 parents 2b7c3e6 + bb0a877 commit 9a1a3aa

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

.github/workflows/fuzzr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ env:
2727

2828
jobs:
2929
build:
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-slim
3131
steps:
3232
- uses: actions/checkout@v6
3333
- uses: ruby/setup-ruby@v1

.github/workflows/linux.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,38 +39,38 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
include:
42-
- os: ubuntu-22.04
43-
CC: gcc-9
44-
CXX: g++-9
45-
ruby: '2.5'
46-
PackageDeps: g++-9
47-
- os: ubuntu-22.04
48-
CC: gcc-9
49-
CXX: g++-9
50-
ruby: '2.6'
51-
PackageDeps: g++-9
52-
- os: ubuntu-22.04
53-
CC: gcc-10
54-
CXX: g++-10
55-
ruby: '2.7'
56-
PackageDeps: g++-10
57-
- os: ubuntu-22.04
58-
CC: gcc-11
59-
CXX: g++-11
42+
- os: ubuntu-24.04
43+
CC: gcc-13
44+
CXX: g++-13
6045
ruby: '3.0'
61-
PackageDeps: g++-11
62-
- os: ubuntu-22.04
63-
CC: gcc-12
64-
CXX: g++-12
65-
ruby: '3.1'
66-
PackageDeps: g++-12
46+
PackageDeps: g++-13
47+
make_flags: '--release'
6748
- os: ubuntu-24.04
6849
CC: gcc-13
6950
CXX: g++-13
70-
ruby: '3.2'
51+
ruby: '3.0'
52+
PackageDeps: g++-13
53+
make_flags: '--debug'
54+
- os: ubuntu-24.04
55+
CC: gcc-13
56+
CXX: g++-13
57+
ruby: '3.1'
7158
PackageDeps: g++-13
59+
make_flags: '--release'
60+
- os: ubuntu-24.04
61+
CC: gcc-14
62+
CXX: g++-14
63+
ruby: '3.2'
64+
PackageDeps: g++-14
65+
make_flags: '--release'
66+
- os: ubuntu-24.04
67+
CC: gcc-14
68+
CXX: g++-14
69+
ruby: '3.2'
70+
PackageDeps: g++-14
71+
make_flags: '--debug'
7272
runs-on: ${{ matrix.os }}
73-
name: ${{ matrix.os }} ${{ matrix.CXX }} ruby-${{ matrix.ruby }}
73+
name: ${{ matrix.os }} ${{ matrix.CXX }} ruby-${{ matrix.ruby }} ${{ matrix.make_flags }}
7474
env:
7575
CC: ${{ matrix.CC }}
7676
CXX: ${{ matrix.CXX }}
@@ -129,7 +129,7 @@ jobs:
129129
$X11_BASE_ROOT/bin/brix11 gen build workspace.mwc -- gen build $TAOX11_ROOT/examples -- gen build $TAOX11_ROOT/orbsvcs/tests -- gen build $TAOX11_ROOT/tests
130130
- name: Run brix11 make
131131
run: |
132-
$X11_BASE_ROOT/bin/brix11 make -N $X11_BASE_ROOT -- make -N $TAOX11_ROOT/examples -- make -N $TAOX11_ROOT/orbsvcs/tests -- make -N $TAOX11_ROOT/tests
132+
$X11_BASE_ROOT/bin/brix11 make ${{ matrix.make_flags }} -N $X11_BASE_ROOT -- make ${{ matrix.make_flags }} -N $TAOX11_ROOT/examples -- make ${{ matrix.make_flags }} -N $TAOX11_ROOT/orbsvcs/tests -- make ${{ matrix.make_flags }} -N $TAOX11_ROOT/tests
133133
- name: Install necessary ruby gems
134134
run: |
135135
gem install asciidoctor:2.0.15 coderay

README.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Before bootstrapping TAOX11 make sure you have installed the following prerequis
1818
[cols="<,<",options="header",]
1919
|=========================================
2020
|Prerequisite |Package name
21-
|ruby 2.5 through 3.1.2 |ruby
21+
|ruby 3.0 through 3.1.2 |ruby
2222
|perl v5.10 through v5.36 |perl
2323
|git |git
2424
|=========================================
@@ -28,8 +28,8 @@ On Linux make sure you have installed the following additional prerequisites
2828
[cols="<,<",options="header",]
2929
|=========================================
3030
|Prerequisite |Package name
31-
|gcc version 11 or newer |gcc
32-
|g++ version 11 or newer |gcc-c++
31+
|gcc version 13 or newer |gcc
32+
|g++ version 13 or newer |gcc-c++
3333
|GNU make version 3.81 or newer |make
3434
|GNU Bash|bash
3535
|=========================================

0 commit comments

Comments
 (0)