ci: again

spex-lang · Nov 4, 2024 · 10ffcc0 · 10ffcc0
1 parent 661a27a
commit 10ffcc0
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 50 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -171,9 +171,8 @@ jobs:
         env:
           key: ${{ runner.os }}-ghc-${{ matrix.ghc-version }}-cabal-${{ matrix.cabal-version }}
         with:
-                    # '~/.cache/cabal\n~/.cabal/store\ndist-newstyle' ||
           path: ${{ env.platform == 'x86_64-linux' && 
-                    '/home/runner/.cache/cabal/packages\n/home/runner/.cabal/store\ndist-newstyle' ||
+                    '/home/runner/.cache/cabal/packages\n /home/runner/.cabal/store\n dist-newstyle' ||
                     steps.setup.outputs.cabal-store }}
           key: ${{ env.key }}-plan-${{ hashFiles('**/plan.json') }}
           restore-keys: ${{ env.key }}-plan-
@@ -207,7 +206,7 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: ${{ env.platform == 'x86_64-linux' && 
-                    '/home/runner/.cache/cabal/packages\n/home/runner/.cabal/store\ndist-newstyle' ||
+                    '/home/runner/.cache/cabal/packages\n /home/runner/.cabal/store\n dist-newstyle' ||
                     steps.setup.outputs.cabal-store }}
           key: ${{ steps.cache.outputs.cache-primary-key }}
 

diff --git a/Makefile b/Makefile
@@ -97,7 +97,7 @@ release:
 	ls -R $(SPEX_BIN)
 	for dir in $$(ls $(SPEX_BIN)); do \
 		for bin in $$(ls $(SPEX_BIN)/$$dir); do \
-			if [ $${bin: -4} == ".exe" ]; do \
+			if [ $${bin: -4} == ".exe" ]; then \
 				mv $(SPEX_BIN)/$$dir/$$bin \
 				   $(SPEX_BIN)/$$(basename $$bin .exe)-$(NEW_VERSION)-$$(basename $$dir).exe; \
 				chmod 755 $(SPEX_BIN)/$$(basename $$bin .exe)-$(NEW_VERSION)-$$(basename $$dir).exe; \

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -83,5 +83,49 @@
 
 * Other types of specifications, e.g. syntax grammars where testing generates
   random programs? And perhaps find minimal programs that create unique syntax
-  errors? Use grammars as generators?
-
+  errors? Use grammars as generators? E.g.:
+
+  ```
+    Spec ::= "component" Ident "where" Decl*
+      Decl ::= OpDecl | TypeDecl
+  
+        -- XXX: Allow ModalType in response position? 
+        -- semantics: unique response type will never get reused, and abstract
+        -- response type will always get reused?
+        OpDecl ::= ident ":" Method Path Body? ("->" Type)? 
+  
+          Method ::= "GET" | "POST"
+  
+          Path ::= ("/" PathSegment)* "/"?
+  
+            PathSegment = "{" ident ":" ModalType "}" | path
+  
+          Body ::= "{" ModalType "}"
+  
+        TypeDecl ::= "type" Ident "=" Type
+  
+    ModalType ::= Mode? Type
+  
+    Mode ::= "@" | "!"
+  
+    Type ::= BaseType | RecordDecl | Ident
+  
+    BaseType ::= "Unit" | "Bool" | "Int" | "String"
+  
+    RecordDecl ::= "{" Field ("," Field)* "}"  -- XXX: parser allows empty records?
+      Field ::= ident ":" Type                 -- XXX: Modal type
+  
+  
+    Ident ::= [A-Z][a-zA-Z0-9]*
+    ident ::= [a-z][a-zA-Z0-9]*
+  
+    -- https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
+    path ::= pchar+
+      pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+  
+      pct-encoded   = "%" HEXDIG HEXDIG
+  
+      unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+      sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+                    / "*" / "+" / "," / ";" / "="
+  ```
diff --git a/TODO.md b/TODO.md
@@ -11,50 +11,6 @@ Here's what I'm currently working on:
   + https://github.com/Gabriella439/grace/blob/main/CODE_OF_CONDUCT.md ?
 - docs: document syntax?
 
-```
-  Spec ::= "component" Ident "where" Decl*
-    Decl ::= OpDecl | TypeDecl
-
-      -- XXX: Allow ModalType in response position? 
-      -- semantics: unique response type will never get reused, and abstract
-      -- response type will always get reused?
-      OpDecl ::= ident ":" Method Path Body? ("->" Type)? 
-
-        Method ::= "GET" | "POST"
-
-        Path ::= ("/" PathSegment)* "/"?
-
-          PathSegment = "{" ident ":" ModalType "}" | path
-
-        Body ::= "{" ModalType "}"
-
-      TypeDecl ::= "type" Ident "=" Type
-
-  ModalType ::= Mode? Type
-
-  Mode ::= "@" | "!"
-
-  Type ::= BaseType | RecordDecl | Ident
-
-  BaseType ::= "Unit" | "Bool" | "Int" | "String"
-
-  RecordDecl ::= "{" Field ("," Field)* "}"  -- XXX: parser allows empty records?
-    Field ::= ident ":" Type                 -- XXX: Modal type
-
-
-  Ident ::= [A-Z][a-zA-Z0-9]*
-  ident ::= [a-z][a-zA-Z0-9]*
-
-  -- https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
-  path ::= pchar+
-    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-
-    pct-encoded   = "%" HEXDIG HEXDIG
-
-    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-                  / "*" / "+" / "," / ";" / "="
-```
 - Nice errors
   + Introduce FancyError datatype and display it in LibMain?
   + https://elm-lang.org/news/compiler-errors-for-humans
@@ -64,6 +20,7 @@ Here's what I'm currently working on:
   + https://gleam.run/
 
 - Packaging
+  + smoke test: curl spexup && spex --version | grep "^v..."
   + move petstore to separate repo?
   + caching
     * https://github.com/moby/buildkit/issues/1673