Skip to content

[ci] add gcc14 make on linux #823

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

Merged
yuxiaomao merged 2 commits into from
Sep 5, 2025
Merged

[ci] add gcc14 make on linux #823

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0243773
[ci] add gcc14 make on linux
yuxiaomao Sep 3, 2025
632f0c0
[ci] rename to makegcc14 to be more explicit, remove export
yuxiaomao Sep 4, 2025
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
26 changes: 21 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
matrix:
target: [linux, darwin, windows]
architecture: [32, 64, arm64]
build_system: [make, cmake, vs2019]
build_system: [make, cmake, vs2019, makegcc]
Copy link
Member

@tobil4sk tobil4sk Sep 3, 2025

Choose a reason for hiding this comment

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

gcc should already be used on linux by default with make, so maybe we should call this new config something a bit more descriptive.


include:
- target: linux
runner: ubuntu-22.04
runner: ubuntu-latest
haxe_nightly_dir: linux64
archive_ext: tar.gz

Expand Down Expand Up @@ -94,6 +94,12 @@ jobs:
architecture: 64
build_system: make

- target: darwin
build_system: makegcc

- target: windows
build_system: makegcc

steps:
- name: "SCM Checkout"
uses: actions/checkout@v5
Expand Down Expand Up @@ -146,6 +152,16 @@ jobs:
;;
esac

- name: "Install: GCC 14"
if: matrix.build_system == 'makegcc'
run: |
sudo add-apt-repository universe
sudo apt update
sudo apt install -y gcc-14 g++-14
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 60 --slave /usr/bin/g++ g++ /usr/bin/g++-14
gcc --version
export CC=gcc
Copy link
Member

@tobil4sk tobil4sk Sep 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think this line has the intended effect (it does not persist between shells), but maybe it's not necessary if the new version is already added to path?


- name: Install haxe
uses: krdlab/setup-haxe@f0a0baa8ccdb1fe4fc316c8f30eb3ca77aa4ea4e
with:
Expand Down Expand Up @@ -186,7 +202,7 @@ jobs:
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-DFLAT_INSTALL_TREE=ON
;;
*)
linux64)
cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.cmake_configuration }} ;;
esac

Expand All @@ -206,7 +222,7 @@ jobs:
echo "WINDOWS_BUILD_FOLDER=$BUILD_FOLDER" >> $GITHUB_ENV
;;

make)
make*)
make
sudo make install
if [[ ${{ matrix.target }} == linux ]]; then
Expand Down Expand Up @@ -240,7 +256,7 @@ jobs:
vs2019)
${{ env.WINDOWS_BUILD_FOLDER }}/hl.exe --version
;;
make)
make*)
if [[ ${{ matrix.architecture }} != arm64 ]]; then
./hl --version
case ${{ matrix.target }} in
Expand Down