diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2dde285..4096ebe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,19 +31,16 @@ jobs: - target: os: linux builder: ubuntu-20.04 - shell: bash - target: os: macos builder: macos-12 - shell: bash - target: os: windows builder: windows-latest - shell: msys2 {0} defaults: run: - shell: ${{ matrix.shell }} + shell: bash name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch }})' runs-on: ${{ matrix.builder }} @@ -74,26 +71,31 @@ jobs: chmod 755 external/bin/gcc external/bin/g++ echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH - - name: MSYS2 (Windows i386) - if: runner.os == 'Windows' && matrix.target.cpu == 'i386' - uses: msys2/setup-msys2@v2 + - name: Restore llvm-mingw (Windows) from cache + if: runner.os == 'Windows' + id: windows-mingw-cache + uses: actions/cache@v3 with: - path-type: inherit - msystem: MINGW32 - install: >- - base-devel - git - mingw-w64-i686-toolchain + path: external/mingw-${{ matrix.target.cpu }} + key: 'mingw-llvm-17-${{ matrix.target.cpu }}' - - name: MSYS2 (Windows amd64) - if: runner.os == 'Windows' && matrix.target.cpu == 'amd64' - uses: msys2/setup-msys2@v2 - with: - path-type: inherit - install: >- - base-devel - git - mingw-w64-x86_64-toolchain + - 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 if: runner.os == 'Windows' @@ -116,6 +118,7 @@ jobs: if: > runner.os == 'Windows' run: | + echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH echo "${{ github.workspace }}/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH - name: Derive environment variables diff --git a/bearssl/abi/bearssl_pem.nim b/bearssl/abi/bearssl_pem.nim index 6f3f829..1b26ac2 100644 --- a/bearssl/abi/bearssl_pem.nim +++ b/bearssl/abi/bearssl_pem.nim @@ -42,7 +42,15 @@ proc pemDecoderPush*(ctx: var PemDecoderContext; data: pointer; len: uint): uint proc pemDecoderSetdest*(ctx: var PemDecoderContext; dest: proc (destCtx: pointer; src: pointer; len: uint) {.importcFunc.}; destCtx: pointer) {.inline.} = - ctx.dest = dest + + # llvm-mingw will complaints about `incompatible function pointer types` + # because generated type missing const in the middle param + # `void (*)(void *, void *, size_t)` + when false: + ctx.dest = dest + + {.emit: """typedef void (*pem_decoder_dest_t)(void *, const void *, size_t);""" .} + {.emit: [ctx.dest, "= (pem_decoder_dest_t)", dest, ";"].} ctx.destCtx = destCtx @@ -62,7 +70,7 @@ const proc pemDecoderName*(ctx: var PemDecoderContext): cstring {.inline.} = - return addr ctx.name + return cast[cstring](addr ctx.name) proc pemEncode*(dest: pointer; data: pointer; len: uint; banner: cstring; flags: cuint): uint {. diff --git a/bearssl/pem.nim b/bearssl/pem.nim index 1ddd937..2ce76a4 100644 --- a/bearssl/pem.nim +++ b/bearssl/pem.nim @@ -30,7 +30,7 @@ func lastEvent*(ctx: var PemDecoderContext): cint = func banner*(ctx: PemDecoderContext): string = ## Return the `name` field as a string if ctx.name[ctx.name.high] == char(0): - $(unsafeAddr ctx.name) + $(cast[cstring](unsafeAddr ctx.name)) else: var res = newString(ctx.name.len) for i, c in ctx.name: res[i] = ctx.name[i]