From 46dd8fa5c7473838a7b0b113fbd4c43226e01948 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 11 Sep 2024 10:59:09 -0700 Subject: [PATCH 1/4] ci: test can be workflow dispatched --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f684d0e7b..05eb82bd5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,10 @@ -on: [push, pull_request] +on: + push: {} + pull_request: {} + workflow_dispatch: {} + name: Test + jobs: build: strategy: From 5cc853aa6a592581c9d47d81d688e841ef74e968 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 11 Sep 2024 11:07:15 -0700 Subject: [PATCH 2/4] flake: update to Nixpkgs 24.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 8e1427318..b5e75bae7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "lastModified": 1726062281, + "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-23.05", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 520dbbf49..cf10c527f 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # We want to stay as up to date as possible but need to be careful that the # glibc versions used by our dependencies from Nix are compatible with the # system glibc that the user is building for. - nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; zig = { url = "github:mitchellh/zig-overlay"; From 162f3390ca7a603dc07fe22b833b1098161466c7 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 11 Sep 2024 11:15:38 -0700 Subject: [PATCH 3/4] prettier --- example/app.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example/app.ts b/example/app.ts index bb85d5aaa..5b426a333 100644 --- a/example/app.ts +++ b/example/app.ts @@ -102,12 +102,12 @@ fetch(url.href) group_add_face( group, 0 /* regular */, - deferred_face_new(font_name.ptr, font_name.len, 0 /* text */) + deferred_face_new(font_name.ptr, font_name.len, 0 /* text */), ); group_add_face( group, 0 /* regular */, - deferred_face_new(font_name.ptr, font_name.len, 1 /* emoji */) + deferred_face_new(font_name.ptr, font_name.len, 1 /* emoji */), ); // Initialize our sprite font, without this we just use the browser. @@ -168,7 +168,7 @@ fetch(url.href) group_cache, cp, 0, - -1 /* best choice */ + -1 /* best choice */, ); group_cache_render_glyph(group_cache, font_idx, cp, -1); From 750f7a7fa4a324ab52fc3a5d808e4a20eaa48224 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 11 Sep 2024 11:29:56 -0700 Subject: [PATCH 4/4] flake: remove unnecessary unstable lib --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index cf10c527f..43b808393 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ packages.${system} = let mkArgs = optimize: { - inherit (pkgs-unstable) zig_0_13 lib; + inherit (pkgs-unstable) zig_0_13; inherit optimize; revision = self.shortRev or self.dirtyShortRev or "dirty";