From fe021554725b0197e359168c4eebf58e981e7f5c Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Tue, 16 Nov 2021 22:10:34 -0800 Subject: [PATCH] zig- update to master 0.9.0-dev.1599 --- .github/workflows/push.yml | 2 +- .github/workflows/zig.yml | 2 +- Dockerfile | 2 +- README.md | 2 +- src/db/Remote.zig | 4 ++-- src/db/User.zig | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ea7ade7..dc9e755 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -27,7 +27,7 @@ jobs: # Zig - uses: goto-bus-stop/setup-zig@v1 with: - version: 0.9.0-dev.1524+d2f9646d9 + version: 0.9.0-dev.1599+008b0ec5e - run: zig version - run: zig env - uses: nektro/actions-setup-zigmod@v1 diff --git a/.github/workflows/zig.yml b/.github/workflows/zig.yml index 117b977..a72157b 100644 --- a/.github/workflows/zig.yml +++ b/.github/workflows/zig.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Zig uses: goto-bus-stop/setup-zig@v1 with: - version: 0.9.0-dev.1524+d2f9646d9 + version: 0.9.0-dev.1599+008b0ec5e - run: zig version - run: zig env diff --git a/Dockerfile b/Dockerfile index 3ece751..b1bf919 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /app COPY . . ARG RELEASE_NUM RUN apk add bash sudo wget curl jq git -RUN ./download_zig.sh 0.9.0-dev.1524+d2f9646d9 +RUN ./download_zig.sh 0.9.0-dev.1599+008b0ec5e RUN zigmod ci RUN zig build -Dversion=r${RELEASE_NUM} diff --git a/README.md b/README.md index f014284..54b6a55 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ $ zig build ``` ## Built With -- Zig master (at least `0.9.0-dev.1524+d2f9646d9`) +- Zig master (at least `0.9.0-dev.1599+008b0ec5e`) - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock) ## License diff --git a/src/db/Remote.zig b/src/db/Remote.zig index 7ba3c91..9f6d34b 100644 --- a/src/db/Remote.zig +++ b/src/db/Remote.zig @@ -57,8 +57,8 @@ pub const Remote = struct { } pub fn create(alloc: *std.mem.Allocator, ty: Type, domain: string) !Remote { - const held = db.mutex.acquire(); - defer held.release(); + db.mutex.lock(); + defer db.mutex.unlock(); return _internal.insert(alloc, &Remote{ .uuid = _internal.factory.newULID(), diff --git a/src/db/User.zig b/src/db/User.zig index b8217fb..bc32d40 100644 --- a/src/db/User.zig +++ b/src/db/User.zig @@ -21,8 +21,8 @@ pub const User = struct { pub const table_name = "users"; pub fn create(alloc: *std.mem.Allocator, provider: u64, snowflake: string, name: string) !User { - const held = db.mutex.acquire(); - defer held.release(); + db.mutex.lock(); + defer db.mutex.unlock(); return try _internal.insert(alloc, &User{ .uuid = _internal.factory.newULID(),