Skip to content

sys(treewide): update to balls 5 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alaviss wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −8
Draft

sys(treewide): update to balls 5 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc30350
sys(treewide): update to balls 5
alaviss Jan 18, 2024
ff363fd
ci: update runners and install valgrind
alaviss Jan 18, 2024
59fdaf2
epoll: make wait with var input a simple wrapper
alaviss Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ jobs:
arch: [i386, amd64]
include:
- target: linux
builder: ubuntu-20.04
builder: ubuntu-22.04
- target: macos
builder: macos-11
builder: macos-12
- target: windows
builder: windows-2019
builder: windows-2022
- target: linux
arch: amd64
branch: devel
pushdocs: true
exclude:
- target: macos
arch: i386
name: "${{ matrix.target }} on ${{ matrix.arch }} (Nim ${{ matrix.branch }})"
name:
"${{ matrix.target }} on ${{ matrix.arch }} (Nim ${{ matrix.branch }})"
runs-on: ${{ matrix.builder }}

defaults:
Expand Down Expand Up @@ -60,6 +61,12 @@ jobs:
platform: x86
static: 0

- name: Install valgrind (Linux-only)
if: runner.os == 'Linux'
run: |
sudo apt-fast update -qq
sudo DEBIAN_FRONTEND='noninteractive' apt-fast install -yq valgrind

- name: Setup Nim
uses: alaviss/setup-nim@0.1.1
with:
Expand Down Expand Up @@ -90,8 +97,8 @@ jobs:

- name: Publish docs
if: >
matrix.pushdocs && github.event_name == 'push' &&
github.ref == 'refs/heads/master'
matrix.pushdocs && github.event_name == 'push' && github.ref ==
'refs/heads/master'
uses: crazy-max/ghaction-github-pages@v3.0.0
with:
build_dir: nim-sys/htmldocs
Expand Down
3 changes: 2 additions & 1 deletion src/sys/private/syscall/linux/epoll.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ proc create*(flags: cint): FD {.cdecl, importc: "epoll_create1".}
proc ctl*(epfd: FD, op: CtlOp, fd: handles.FD, event: ptr Event): cint
{.cdecl, importc: "epoll_ctl".}
proc ctl*(epfd: FD, op: CtlOp, fd: handles.FD, event: var Event): cint
{.cdecl, importc: "epoll_ctl".}
{.inline.} =
ctl(epfd, op, fd, addr event)

proc wait*(epfd: FD, events: ptr UncheckedArray[Event], maxevents: cint,
timeout: cint): cint {.cdecl, importc: "epoll_wait".}
Expand Down
2 changes: 1 addition & 1 deletion sys.nimble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ srcDir = "src"
# Dependencies

requires "nim >= 1.5.1"
requires "https://github.com/disruptek/balls >= 3.9.0 & < 4.0.0"
requires "https://github.com/disruptek/balls >= 5.0.0 & < 6.0.0"
when (NimMajor, NimMinor, NimPatch) < (1, 9, 0):
requires "https://github.com/nim-works/cps >= 0.8.0 & < 0.9.0"
else:
Expand Down