use correct Nim version in daily job, and `--mm:refc` on `devel` (#6023)
Daily CI uses an outdated Nim 1.6 because it uses `origin/version-1-6` which is not maintained very regularly. Pull from `upstream/version-1-6` instead, same as in `ci.yml`, and also make sure that `--mm:refc` is turned on for `upstream/devel`.
This commit is contained in:
parent
bb8c6cda18
commit
a18c396d9d
|
@ -26,8 +26,13 @@ jobs:
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
- os: windows
|
- os: windows
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
branch: [version-1-6, devel]
|
branch: [upstream/version-1-6, upstream/devel]
|
||||||
include:
|
include:
|
||||||
|
- branch: upstream/version-1-6
|
||||||
|
branch-short: version-1-6
|
||||||
|
- branch: upstream/devel
|
||||||
|
branch-short: devel
|
||||||
|
nimflags-extra: --mm:refc
|
||||||
- target:
|
- target:
|
||||||
os: linux
|
os: linux
|
||||||
builder: ubuntu-20.04
|
builder: ubuntu-20.04
|
||||||
|
@ -45,9 +50,9 @@ jobs:
|
||||||
run:
|
run:
|
||||||
shell: ${{ matrix.shell }}
|
shell: ${{ matrix.shell }}
|
||||||
|
|
||||||
name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch }})'
|
name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch-short }})'
|
||||||
runs-on: ${{ matrix.builder }}
|
runs-on: ${{ matrix.builder }}
|
||||||
continue-on-error: ${{ matrix.branch == 'devel' }}
|
continue-on-error: ${{ matrix.branch-short == 'devel' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
if: ${{ github.event_name != 'pull_request' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
|
@ -132,7 +137,6 @@ jobs:
|
||||||
# Stack usage test on recent enough gcc:
|
# Stack usage test on recent enough gcc:
|
||||||
if [[ '${{ runner.os }}' == 'Linux' && '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
if [[ '${{ runner.os }}' == 'Linux' && '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
||||||
export NIMFLAGS="${NIMFLAGS} -d:limitStackUsage"
|
export NIMFLAGS="${NIMFLAGS} -d:limitStackUsage"
|
||||||
echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# libminiupnp / natpmp
|
# libminiupnp / natpmp
|
||||||
|
@ -141,6 +145,9 @@ jobs:
|
||||||
echo "CFLAGS=${CFLAGS}" >> $GITHUB_ENV
|
echo "CFLAGS=${CFLAGS}" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
export NIMFLAGS="${NIMFLAGS} ${{ matrix.nimflags-extra }}"
|
||||||
|
echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV
|
||||||
|
|
||||||
ncpu=""
|
ncpu=""
|
||||||
make_cmd="make"
|
make_cmd="make"
|
||||||
case '${{ runner.os }}' in
|
case '${{ runner.os }}' in
|
||||||
|
|
Loading…
Reference in New Issue