Merge branch 'main' of https://github.com/EffectOrientedProgramming/book

EffectOrientedProgramming · Jul 22, 2024 · fe17ece · fe17ece
2 parents 7351731 + f730453
commit fe17ece
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/.github/workflows/test-examples.pkl b/.github/workflows/test-examples.pkl
@@ -24,7 +24,7 @@ jobs {
           uses = "actions/checkout@v4"
           with {
             ["submodules"] = "recursive"
-            ["token"] = "${{ secrets.API_TOKEN_GITHUB }}"
+            //["token"] = "${{ secrets.API_TOKEN_GITHUB }}"
           }
         }
 

diff --git a/.github/workflows/test-examples.yml b/.github/workflows/test-examples.yml
@@ -11,7 +11,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-        token: ${{ secrets.API_TOKEN_GITHUB }}
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
@@ -25,7 +24,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-        token: ${{ secrets.API_TOKEN_GITHUB }}
     - uses: actions/setup-java@v4
       with:
         distribution: temurin

diff --git a/.github/workflows/test.pkl b/.github/workflows/test.pkl
@@ -0,0 +1,18 @@
+// pkl eval --format yaml -o test.yml test.pkl
+
+amends "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected]#/GitHubAction.pkl"
+import "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected]#/GitHubAction.pkl"
+
+on {
+  pull_request {
+
+  }
+}
+
+jobs {
+  ["test"] = new {
+    `runs-on` = "ubuntu-latest"
+
+    steps = GitHubAction.Scala.sbtTestSteps(null, null, null)
+  }
+}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,14 @@
+# Generated file. DO NOT EDIT.
+'on':
+  pull_request: {}
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: '20'
+        cache: sbt
+    - run: sbt test
diff --git a/build.sbt b/build.sbt
@@ -58,11 +58,11 @@ libraryDependencies ++=
             "metaconfig-typesafe-config"
           ) excludeAll
           ("com.geirsson", "metaconfig-core"),
-    "nl.vroste" %% "rezilience"   % "0.9.4",
+    "nl.vroste" %% "rezilience"   % "0.10.1",
     "org.scalameta" %% "mdoc" % "2.5.4",
     "dev.zio"   %% "zio-test" % zioVersion,
     "dev.zio"   %% "zio-test-sbt" % zioVersion % Test,
-    "com.lihaoyi" %% "os-lib" % "0.10.2" % Test,
+    "com.lihaoyi" %% "os-lib" % "0.10.3" % Test,
   )
 
 fork := true

diff --git a/examples b/examples
+1 −1		src/main/scala/Chapter03_Superpowers.scala
+15 −12		src/main/scala/Chapter04_Initialization.scala
+5 −5		src/main/scala/Chapter05_Testing.scala
+1 −1		src/main/scala/Chapter06_Failure.scala
+1 −2		src/main/scala/Chapter07_Composability.scala
+1 −1		src/main/scala/Chapter08_State.scala
+16 −17		src/main/scala/Chapter09_Resilience.scala