update ci.yml to test Nim 2.2; also test gcc-14

This commit is contained in:
narimiran 2024-09-10 15:39:21 +02:00
parent 7c81df9adc
commit 98bbc71450
No known key found for this signature in database
GPG Key ID: 858F5E6FB71FD8F5
2 changed files with 28 additions and 6 deletions

View File

@ -14,21 +14,31 @@ jobs:
target:
- os: linux
cpu: amd64
- os: linux-gcc-14 # This is to use ubuntu 24 and install gcc 14. Should be removed when ubuntu-latest is 26.04
cpu: amd64
- os: linux
cpu: i386
- os: macos
cpu: amd64
- os: macos
cpu: arm64
- os: windows
cpu: amd64
#- os: windows
#cpu: i386
branch: [version-1-6, version-2-0, devel]
branch: [version-2-0, version-2-2, devel]
include:
- target:
os: linux
builder: ubuntu-latest
- target:
os: linux-gcc-14 # This is to use ubuntu 24 and install gcc 14. Should be removed when ubuntu-latest is 26.04
builder: ubuntu-24.04
- target:
os: macos
cpu: amd64
builder: macos-13
- target:
os: macos
cpu: arm64
builder: macos-latest
- target:
os: windows
@ -45,7 +55,7 @@ jobs:
uses: actions/checkout@v4
- name: Set GCC 10 as default compiler (Linux)
if: runner.os == 'Linux' && matrix.target.cpu != 'i386'
if: runner.os == 'Linux' && matrix.target.cpu != 'i386' && matrix.target.os != 'linux-gcc-14'
run: |
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
--slave /usr/bin/g++ g++ /usr/bin/g++-10 \
@ -125,6 +135,8 @@ jobs:
run: |
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
PLATFORM=x64
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
PLATFORM=arm64
else
PLATFORM=x86
fi
@ -156,6 +168,15 @@ jobs:
bash build_nim.sh nim csources dist/nimble NimBinaries
echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
- name: Use gcc 14
# Should be removed when ubuntu-latest is 26.04
if : ${{ matrix.target.os == 'linux-gcc-14' }}
run: |
# Add GCC-14 to alternatives
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
# Set GCC-14 as the default
sudo update-alternatives --set gcc /usr/bin/gcc-14
- name: Run tests
run: |
if [[ "${{ matrix.target.os }}" == "windows" ]]; then
@ -164,6 +185,7 @@ jobs:
fi
nim --version
nimble --version
gcc --version
nimble install -y --depsOnly
env TEST_LANG="c" nimble test
# run test against intx

View File

@ -28,9 +28,9 @@ proc build(args, path: string) =
exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path
proc run(args, path: string) =
build args & " -r", path
if (NimMajor, NimMinor) > (1, 6):
build args & " --mm:refc -r", path
if (NimMajor, NimMinor) > (1, 6):
build args & " --mm:orc -r", path
proc test(path: string) =
for config in ["", "-d:stintNoIntrinsics"]: