Skip to content

Commit

Permalink
Add Ubuntu 24.04 to Github CI (#92)
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberjunk authored Nov 15, 2024
1 parent bc80d9f commit cc2c4f3
Show file tree
Hide file tree
Showing 13 changed files with 115 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
arch: [amd64, i386, arm64, armhf]
cpurev: [legacy, default, modern]
steps:
Expand All @@ -39,7 +39,7 @@ jobs:

# Cross-Compile Support
- name: Cross-Compile Support
uses: cyberjunk/gha-ubuntu-cross@v4
uses: cyberjunk/gha-ubuntu-cross@v5
if: matrix.arch != 'amd64'
with:
arch: ${{ matrix.arch }}
Expand Down
12 changes: 8 additions & 4 deletions build/make/CppCore.Test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ VERSIONMACROMAJOR = CPPCORE_VERSION_MAJOR
VERSIONMACROMINOR = CPPCORE_VERSION_MINOR
VERSIONMACROPATCH = CPPCORE_VERSION_PATCH

DEC64MB := 67108864
HEX8MB := 0x00800000
DEC8MB := 8388608

################################################################################################
# CPU Specific

Expand Down Expand Up @@ -65,7 +69,9 @@ OUTDIST := $(DISTDIR)/$(NAME).app/Contents/MacOS/$(NAME)$(EXTBIN)
DEFINES := $(DEFINES)
CXXFLAGS := $(CXXFLAGS) -fdeclspec -ObjC++
CFLAGS := $(CFLAGS)
LINKFLAGS := $(LINKFLAGS) -Wl,-object_path_lto,$(OBJDIR)/lto.o
LINKFLAGS := $(LINKFLAGS) \
-Wl,-object_path_lto,$(OBJDIR)/lto.o \
-Wl,-stack_size -Wl,$(HEX8MB)
LINKLIBS := $(LINKLIBS) -framework AppKit
RESO := $(RESO)
endif
Expand All @@ -75,7 +81,7 @@ OUTDIST := $(DISTDIR)/$(NAME)-$(TARGET_ARCH)/usr/bin/$(NAME)$(EXTBIN)
DEFINES := $(DEFINES)
CXXFLAGS := $(CXXFLAGS)
CFLAGS := $(CFLAGS)
LINKFLAGS := $(LINKFLAGS)
LINKFLAGS := $(LINKFLAGS) -Wl,-z,stack-size=$(DEC8MB)
LINKLIBS := $(LINKLIBS) -lpthread
RESO := $(RESO)
endif
Expand Down Expand Up @@ -105,8 +111,6 @@ OUTDIST := $(DISTDIR)/$(NAME)$(EXTBIN)
DEFINES := $(DEFINES)
CXXFLAGS := $(CXXFLAGS)
CFLAGS := $(CFLAGS)
DEC64MB := 67108864
HEX8MB := 0x00800000
LINKFLAGS := $(LINKFLAGS) \
-Wl,-z,stack-size=$(HEX8MB) \
-Wl,--initial-heap=$(DEC64MB) \
Expand Down
3 changes: 3 additions & 0 deletions dist/ubuntu-24.04/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**/
*.deb
*.whl
9 changes: 9 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.Client.Resources.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Package: CppCore.Example.Client.Resources
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: all
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore.Example.Client Resources
Resources of CppCore.Example.Client.

10 changes: 10 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.Client.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Package: CppCore.Example.Client
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: {ARCH}
Depends: libc6:{ARCH} (>= 2.39)
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore Example Client
Just an example to demonstrate Client code of CppCore.

10 changes: 10 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.Client.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Name={DISPLAYNAME}
Comment=Example Client of CppCore
Exec=/usr/bin/CppCore.Example.Client
Icon=/usr/share/pixmaps/CppCore.Example.Client.png
Terminal=true
Type=Application
Categories=Development;
StartupNotify=true
NoDisplay=false
9 changes: 9 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.Server.Resources.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Package: CppCore.Example.Server.Resources
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: all
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore.Example.Server Resources
Resources of CppCore.Example.Server.

10 changes: 10 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.Server.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Package: CppCore.Example.Server
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: {ARCH}
Depends: libc6:{ARCH} (>= 2.39)
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore Example Server
Just an example to demonstrate server code of CppCore.

10 changes: 10 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.Server.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Name={DISPLAYNAME}
Comment=Example Server of CppCore
Exec=/usr/bin/CppCore.Example.Server
Icon=/usr/share/pixmaps/CppCore.Example.Server.png
Terminal=true
Type=Application
Categories=Development;
StartupNotify=true
NoDisplay=false
9 changes: 9 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.UI.Resources.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Package: CppCore.Example.UI.Resources
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: all
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore.Example.UI Resources
Resources of CppCore.Example.UI.

15 changes: 15 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.UI.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Package: CppCore.Example.UI
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: {ARCH}
Depends: libc6:{ARCH} (>= 2.39),
libbsd0:{ARCH} (>= 0.12.1),
libxau6:{ARCH} (>= 1.0.9),
libxcb1:{ARCH} (>= 1.15),
libxdmcp6:{ARCH} (>= 1.1.3),
libx11-6:{ARCH} (>= 1.8.7)
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore Example UI
Just an example to demonstrate UI code of CppCore.

10 changes: 10 additions & 0 deletions dist/ubuntu-24.04/CppCore.Example.UI.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Name={DISPLAYNAME}
Comment=Example UI of CppCore
Exec=/usr/bin/CppCore.Example.UI
Icon=/usr/share/pixmaps/CppCore.Example.UI.png
Terminal=true
Type=Application
Categories=Development;
StartupNotify=true
NoDisplay=false
10 changes: 10 additions & 0 deletions dist/ubuntu-24.04/CppCore.Interface.C.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Package: CppCore.Interface.C
Version: {VERSION}-1
Section: base
Priority: optional
Architecture: {ARCH}
Depends: libc6:{ARCH} (>= 2.39)
Maintainer: Clint Banzhaf <clint@banzhaf.pro>
Description: CppCore Interface for C
Provides access to CppCore from C

0 comments on commit cc2c4f3

Please sign in to comment.