From a18c396d9da802c80b0d5817d67fcf3c209913ac Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Mon, 4 Mar 2024 15:21:28 +0100 Subject: [PATCH] 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`. --- .github/workflows/cron.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 3806be5b2..88433e8d1 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -26,8 +26,13 @@ jobs: cpu: amd64 - os: windows cpu: amd64 - branch: [version-1-6, devel] + branch: [upstream/version-1-6, upstream/devel] include: + - branch: upstream/version-1-6 + branch-short: version-1-6 + - branch: upstream/devel + branch-short: devel + nimflags-extra: --mm:refc - target: os: linux builder: ubuntu-20.04 @@ -45,9 +50,9 @@ jobs: run: 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 }} - continue-on-error: ${{ matrix.branch == 'devel' }} + continue-on-error: ${{ matrix.branch-short == 'devel' }} steps: - name: Checkout if: ${{ github.event_name != 'pull_request' }} @@ -132,7 +137,6 @@ jobs: # Stack usage test on recent enough gcc: if [[ '${{ runner.os }}' == 'Linux' && '${{ matrix.target.cpu }}' == 'amd64' ]]; then export NIMFLAGS="${NIMFLAGS} -d:limitStackUsage" - echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV fi # libminiupnp / natpmp @@ -141,6 +145,9 @@ jobs: echo "CFLAGS=${CFLAGS}" >> $GITHUB_ENV fi + export NIMFLAGS="${NIMFLAGS} ${{ matrix.nimflags-extra }}" + echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV + ncpu="" make_cmd="make" case '${{ runner.os }}' in