update ci.yml to test Nim 2.2; also test gcc-14
This commit is contained in:
parent
7c81df9adc
commit
98bbc71450
|
@ -14,21 +14,31 @@ jobs:
|
||||||
target:
|
target:
|
||||||
- os: linux
|
- os: linux
|
||||||
cpu: amd64
|
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
|
- os: linux
|
||||||
cpu: i386
|
cpu: i386
|
||||||
- os: macos
|
- os: macos
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
|
- os: macos
|
||||||
|
cpu: arm64
|
||||||
- os: windows
|
- os: windows
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
#- os: windows
|
branch: [version-2-0, version-2-2, devel]
|
||||||
#cpu: i386
|
|
||||||
branch: [version-1-6, version-2-0, devel]
|
|
||||||
include:
|
include:
|
||||||
- target:
|
- target:
|
||||||
os: linux
|
os: linux
|
||||||
builder: ubuntu-latest
|
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:
|
- target:
|
||||||
os: macos
|
os: macos
|
||||||
|
cpu: amd64
|
||||||
|
builder: macos-13
|
||||||
|
- target:
|
||||||
|
os: macos
|
||||||
|
cpu: arm64
|
||||||
builder: macos-latest
|
builder: macos-latest
|
||||||
- target:
|
- target:
|
||||||
os: windows
|
os: windows
|
||||||
|
@ -45,7 +55,7 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set GCC 10 as default compiler (Linux)
|
- 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: |
|
run: |
|
||||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
|
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
|
||||||
--slave /usr/bin/g++ g++ /usr/bin/g++-10 \
|
--slave /usr/bin/g++ g++ /usr/bin/g++-10 \
|
||||||
|
@ -125,6 +135,8 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
||||||
PLATFORM=x64
|
PLATFORM=x64
|
||||||
|
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
|
||||||
|
PLATFORM=arm64
|
||||||
else
|
else
|
||||||
PLATFORM=x86
|
PLATFORM=x86
|
||||||
fi
|
fi
|
||||||
|
@ -156,6 +168,15 @@ jobs:
|
||||||
bash build_nim.sh nim csources dist/nimble NimBinaries
|
bash build_nim.sh nim csources dist/nimble NimBinaries
|
||||||
echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
|
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
|
- name: Run tests
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ matrix.target.os }}" == "windows" ]]; then
|
if [[ "${{ matrix.target.os }}" == "windows" ]]; then
|
||||||
|
@ -164,6 +185,7 @@ jobs:
|
||||||
fi
|
fi
|
||||||
nim --version
|
nim --version
|
||||||
nimble --version
|
nimble --version
|
||||||
|
gcc --version
|
||||||
nimble install -y --depsOnly
|
nimble install -y --depsOnly
|
||||||
env TEST_LANG="c" nimble test
|
env TEST_LANG="c" nimble test
|
||||||
# run test against intx
|
# run test against intx
|
||||||
|
|
|
@ -28,9 +28,9 @@ proc build(args, path: string) =
|
||||||
exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path
|
exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path
|
||||||
|
|
||||||
proc run(args, path: string) =
|
proc run(args, path: string) =
|
||||||
build args & " -r", path
|
|
||||||
if (NimMajor, NimMinor) > (1, 6):
|
|
||||||
build args & " --mm:refc -r", path
|
build args & " --mm:refc -r", path
|
||||||
|
if (NimMajor, NimMinor) > (1, 6):
|
||||||
|
build args & " --mm:orc -r", path
|
||||||
|
|
||||||
proc test(path: string) =
|
proc test(path: string) =
|
||||||
for config in ["", "-d:stintNoIntrinsics"]:
|
for config in ["", "-d:stintNoIntrinsics"]:
|
||||||
|
|
Loading…
Reference in New Issue