Merge pull request #155 from Warashi/fix/invalid-regex-on-darwin

fix: invalid regex on darwin
emacs-twist · Mar 18, 2024 · 4e1f872 · 4e1f872
2 parents d641c25 + 7cdf342
commit 4e1f872
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
@@ -19,7 +19,12 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v26

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -13,7 +13,12 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v26

diff --git a/pkgs/build-support/elisp/parseElispHeaders.nix b/pkgs/build-support/elisp/parseElispHeaders.nix
@@ -10,7 +10,7 @@ with builtins; let
   dropWhile = import ../utils/dropWhile.nix;
 
   # Regular expression patterns
-  descriptionRegex = ";;;.+ --- (.+?)";
+  descriptionRegex = ";;;.+ --- (.+)";
   magicHeaderRegex = "(.+)-\\*-.+-\\*-[[:space:]]*";
   headerRegex = ";;[[:space:]]*(.*[^[:space:]]):([[:space:]]*.*)?";
 

diff --git a/pkgs/build-support/gitUrlToAttrs.nix b/pkgs/build-support/gitUrlToAttrs.nix
@@ -1,6 +1,6 @@
 s:
 with builtins; let
-  githubMatch = match "https://github.com/(.+)/(.+?)" s;
+  githubMatch = match "https://github.com/(.+)/(.+)" s;
 in
   if githubMatch != null
   then {