Skip to content

Commit

Permalink
Add memory management flag to test matrix, naming.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlejandroCabeza committed Jun 10, 2024
1 parent 7d8a323 commit df8d3e2
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/actions/install_nim/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
- name: Restore Nim DLLs dependencies (Windows) from cache
if: inputs.os == 'Windows'
id: windows-dlls-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: external/dlls
key: 'dlls'
Expand Down Expand Up @@ -114,7 +114,7 @@ runs:
- name: Restore Nim from cache
id: nim-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: '${{ github.workspace }}/nim'
key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ env.cache_nonce }}
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/base_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,13 @@ jobs:
builder: windows-2019
cpu: amd64
shell: msys2 {0}
nim-branch:
- version-1-6
nim_branch:
- version: version-1-6
memory_management: refc
# - version: version-2-0
# memory_management: orc
# - version: devel
# memory_management: orc
# If exclude or include are defined use their value, otherwise default to empty list (as declared on workflow_call.inputs).
# Reason for above is when workflow is not initiated by workflow_call, the parameters are not defined. Their value is 0 or '' (empty string).
# This relies on the value 0 meaning the parameter was not filled in.
Expand All @@ -64,9 +69,9 @@ jobs:
run:
shell: ${{ matrix.platform.shell }}

name: '${{ matrix.platform.os }}-${{ matrix.platform.cpu }} (Nim ${{ matrix.nim-branch }})'
name: '${{ matrix.platform.os }}-${{ matrix.platform.cpu }} (Nim ${{ matrix.nim_branch }})'
runs-on: ${{ matrix.platform.builder }}
continue-on-error: ${{ matrix.nim-branch == 'version-2-0' || matrix.nim-branch == 'devel' }}
continue-on-error: ${{ matrix.nim_branch == 'version-2-0' || matrix.nim_branch == 'devel' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -78,7 +83,7 @@ jobs:
with:
os: ${{ matrix.platform.os }}
shell: ${{ matrix.platform.shell }}
nim_branch: ${{ matrix.nim-branch }}
nim_branch: ${{ matrix.nim_branch }}
cpu: ${{ matrix.platform.cpu }}

- name: Setup Go
Expand All @@ -99,6 +104,5 @@ jobs:
run: |
nim --version
nimble --version
# --mm:orc | Should we run tests with ORC instead?
NIMFLAGS="${NIMFLAGS} --mm:refc"
NIMFLAGS="${NIMFLAGS} --mm:${{ matrix.nim_branch.memory_management }}"
nimble test
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
env:
CICOV: YES
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Daily amd64
uses: ./.github/workflows/base_tests.yml
with:
include: "[{'nim-branch': 'version-2-0'}]"
include: "[{'nim_branch': 'version-2-0', 'memory_management': 'orc'}]"
exclude: "[{'platform': {'cpu': 'i386'}}]"

test_i386:
Expand All @@ -22,5 +22,5 @@ jobs:
name: Daily
uses: ./.github/workflows/base_tests.yml
with:
include: "[{'nim-branch': 'devel'}]"
include: "[{'nim_branch': 'devel'}, 'memory_management': 'orc']"
exclude: "[{'platform': {'os': 'windows'}}, {'platform': {'os': 'macos'}}, {'platform': {'cpu': 'i386'}}]"
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
]
steps:
- name: Clone repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ matrix.target.repo }}
ref: ${{ matrix.target.branch }}
Expand Down

0 comments on commit df8d3e2

Please sign in to comment.