Switch to mingw-llvm for faster Windows CI
This commit is contained in:
parent
7cfe1cd8da
commit
b517fdc433
|
@ -18,8 +18,8 @@ jobs:
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
- os: windows
|
- os: windows
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
- os: windows
|
#- os: windows
|
||||||
cpu: i386
|
# cpu: i386
|
||||||
include:
|
include:
|
||||||
- target:
|
- target:
|
||||||
os: linux
|
os: linux
|
||||||
|
@ -31,6 +31,10 @@ jobs:
|
||||||
os: windows
|
os: windows
|
||||||
builder: windows-2019
|
builder: windows-2019
|
||||||
|
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
shell: bash
|
||||||
|
|
||||||
name: '${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ matrix.test_lang }}-(Nim ${{ matrix.branch }})'
|
name: '${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ matrix.test_lang }}-(Nim ${{ matrix.branch }})'
|
||||||
runs-on: ${{ matrix.builder }}
|
runs-on: ${{ matrix.builder }}
|
||||||
steps:
|
steps:
|
||||||
|
@ -60,13 +64,31 @@ jobs:
|
||||||
chmod 755 external/bin/gcc external/bin/g++
|
chmod 755 external/bin/gcc external/bin/g++
|
||||||
echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH
|
echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Restore MinGW-W64 (Windows) from cache
|
- name: Restore llvm-mingw (Windows) from cache
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
id: windows-mingw-cache
|
id: windows-mingw-cache
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: external/mingw-${{ matrix.target.cpu }}
|
path: external/mingw-${{ matrix.target.cpu }}
|
||||||
key: 'mingw-${{ matrix.target.cpu }}'
|
key: 'mingw-llvm-17-${{ matrix.target.cpu }}'
|
||||||
|
|
||||||
|
- name: Install llvm-mingw dependency (Windows)
|
||||||
|
if: >
|
||||||
|
steps.windows-mingw-cache.outputs.cache-hit != 'true' &&
|
||||||
|
runner.os == 'Windows'
|
||||||
|
run: |
|
||||||
|
mkdir -p external
|
||||||
|
MINGW_BASE="https://github.com/mstorsjo/llvm-mingw/releases/download/20230905"
|
||||||
|
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
||||||
|
MINGW_URL="$MINGW_BASE/llvm-mingw-20230905-ucrt-x86_64.zip"
|
||||||
|
ARCH=64
|
||||||
|
else
|
||||||
|
MINGW_URL="$MINGW_BASE/llvm-mingw-20230905-ucrt-i686.zip"
|
||||||
|
ARCH=32
|
||||||
|
fi
|
||||||
|
curl -L "$MINGW_URL" -o "external/mingw-${{ matrix.target.cpu }}.zip"
|
||||||
|
7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
|
||||||
|
mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
|
||||||
|
|
||||||
- name: Restore Nim DLLs dependencies (Windows) from cache
|
- name: Restore Nim DLLs dependencies (Windows) from cache
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
|
@ -76,30 +98,10 @@ jobs:
|
||||||
path: external/dlls-${{ matrix.target.cpu }}
|
path: external/dlls-${{ matrix.target.cpu }}
|
||||||
key: 'dlls-${{ matrix.target.cpu }}'
|
key: 'dlls-${{ matrix.target.cpu }}'
|
||||||
|
|
||||||
- name: Install MinGW64 dependency (Windows)
|
|
||||||
if: >
|
|
||||||
steps.windows-mingw-cache.outputs.cache-hit != 'true' &&
|
|
||||||
runner.os == 'Windows'
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p external
|
|
||||||
MINGW_BASE="https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-12.0.1-9.0.0-r1"
|
|
||||||
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
|
||||||
MINGW_URL="$MINGW_BASE/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64-9.0.0-r1.7z"
|
|
||||||
ARCH=64
|
|
||||||
else
|
|
||||||
MINGW_URL="$MINGW_BASE/winlibs-i686-posix-dwarf-gcc-11.2.0-mingw-w64-9.0.0-r1.7z"
|
|
||||||
ARCH=32
|
|
||||||
fi
|
|
||||||
curl -L "$MINGW_URL" -o "external/mingw-${{ matrix.target.cpu }}.7z"
|
|
||||||
7z x -y "external/mingw-${{ matrix.target.cpu }}.7z" -oexternal/
|
|
||||||
mv external/mingw$ARCH external/mingw-${{ matrix.target.cpu }}
|
|
||||||
|
|
||||||
- name: Install DLLs dependencies (Windows)
|
- name: Install DLLs dependencies (Windows)
|
||||||
if: >
|
if: >
|
||||||
steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
|
steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
|
||||||
runner.os == 'Windows'
|
runner.os == 'Windows'
|
||||||
shell: bash
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p external
|
mkdir -p external
|
||||||
curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
|
curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
|
||||||
|
@ -108,14 +110,12 @@ jobs:
|
||||||
- name: Path to cached dependencies (Windows)
|
- name: Path to cached dependencies (Windows)
|
||||||
if: >
|
if: >
|
||||||
runner.os == 'Windows'
|
runner.os == 'Windows'
|
||||||
shell: bash
|
|
||||||
run: |
|
run: |
|
||||||
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
|
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
|
||||||
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
|
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Get latest nimbus-build-system commit hash
|
- name: Get latest nimbus-build-system commit hash
|
||||||
id: versions
|
id: versions
|
||||||
shell: bash
|
|
||||||
run: |
|
run: |
|
||||||
getHash() {
|
getHash() {
|
||||||
git ls-remote "https://github.com/$1" "${2:-HEAD}" | cut -f 1
|
git ls-remote "https://github.com/$1" "${2:-HEAD}" | cut -f 1
|
||||||
|
@ -131,7 +131,6 @@ jobs:
|
||||||
key: '${{ matrix.test_lang }}-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}'
|
key: '${{ matrix.test_lang }}-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}'
|
||||||
|
|
||||||
- name: Build Nim and associated tools
|
- name: Build Nim and associated tools
|
||||||
shell: bash
|
|
||||||
run: |
|
run: |
|
||||||
curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
|
curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
|
||||||
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
||||||
|
@ -150,7 +149,6 @@ jobs:
|
||||||
echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
|
echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Run nim-graphql tests
|
- name: Run nim-graphql tests
|
||||||
shell: bash
|
|
||||||
working-directory: nim-graphql
|
working-directory: nim-graphql
|
||||||
run: |
|
run: |
|
||||||
nimble install -y --depsOnly
|
nimble install -y --depsOnly
|
||||||
|
|
|
@ -23,7 +23,8 @@ requires "nim >= 1.2.0",
|
||||||
"chronicles",
|
"chronicles",
|
||||||
"https://github.com/status-im/nim-zlib",
|
"https://github.com/status-im/nim-zlib",
|
||||||
"unittest2",
|
"unittest2",
|
||||||
"https://github.com/status-im/nim-chronos#head"
|
"https://github.com/status-im/nim-chronos#head",
|
||||||
|
"https://github.com/status-im/nim-bearssl#head"
|
||||||
|
|
||||||
proc test(args, path: string, shouldRun = true) =
|
proc test(args, path: string, shouldRun = true) =
|
||||||
# Compilation language is controlled by TEST_LANG
|
# Compilation language is controlled by TEST_LANG
|
||||||
|
|
Loading…
Reference in New Issue