update ci.yml and be more explicit in .nimble (#55)

* update ci.yml and be more explicit in .nimble

* test both amd64 and arm64 macos
This commit is contained in:
Miran 2024-06-26 04:12:29 +02:00 committed by GitHub
parent 11b9d952a8
commit dbc4a95df6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 deletions

View File

@ -22,23 +22,29 @@ jobs:
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
#cpu: i386
branch: [version-1-6, version-2-0, devel] branch: [version-1-6, version-2-0, devel]
include: include:
- target: - target:
os: linux os: linux
builder: ubuntu-20.04 builder: ubuntu-latest
shell: bash shell: bash
- target: - target:
os: macos os: macos
builder: macos-12 cpu: amd64
builder: macos-13
shell: bash
- target:
os: macos
cpu: arm64
builder: macos-latest
shell: bash shell: bash
- target: - target:
os: windows os: windows
builder: windows-2019 builder: windows-latest
shell: msys2 {0} shell: msys2 {0}
defaults: defaults:
@ -50,7 +56,7 @@ jobs:
continue-on-error: ${{ matrix.branch == 'devel' }} continue-on-error: ${{ matrix.branch == 'devel' }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install build dependencies (Linux i386) - name: Install build dependencies (Linux i386)
if: runner.os == 'Linux' && matrix.target.cpu == 'i386' if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
@ -120,6 +126,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

View File

@ -25,9 +25,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 build args & " --mm:refc -r", path
if (NimMajor, NimMinor) > (1, 6): if (NimMajor, NimMinor) > (1, 6):
build args & " --mm:refc -r", path build args & " --mm:orc -r", path
task test, "Run all tests": task test, "Run all tests":
# TODO asyncdispatch backend is broken / untested # TODO asyncdispatch backend is broken / untested