Merge pull request #4 from fluent-ci-templates/zenith

Make it compatible with Dagger Zenith

.github/workflows/ci.yml

@@ -17,9 +17,9 @@ jobs:
         run: deno install -A -r https://cli.fluentci.io -n fluentci
       - name: Setup Dagger
         run: |
-            curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
-            sudo mv bin/dagger /usr/local/bin
-            dagger version
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
+          sudo mv bin/dagger /usr/local/bin
+          dagger version
       - name: Run Dagger Pipelines
         run: fluentci run deno_pipeline fmt lint test
       - name: Upload Coverage

.github/workflows/example.yml

@@ -20,9 +20,11 @@ jobs:
         run: deno install -A -r https://cli.fluentci.io -n fluentci
       - name: Setup Dagger
         run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
           sudo mv bin/dagger /usr/local/bin
           dagger version
       - name: Run Dagger Pipelines
-        run: dagger run deno run -A ../src/dagger/runner.ts
+        run: |
+          rm ../deno.lock
+          dagger run deno run -A ../src/dagger/runner.ts
         working-directory: example

example/.fluentci/example/.fluentci/fixtures/workflow.yml → .github/workflows/zenith.yml

@@ -1,24 +1,24 @@
 # Do not edit this file directly. It is generated by https://deno.land/x/fluent_github_actions
 
-name: build
+name: Zenith Example
 on:
   push:
     branches:
-      - main
+      - zenith
+
 jobs:
-  build:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.37
-      - name: Setup Fluent CI CLI
-        run: deno install -A -r https://cli.fluentci.io -n fluentci
-      - name: Setup Dagger
+      - name: Setup Dagger Zenith
         run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
           sudo mv bin/dagger /usr/local/bin
           dagger version
       - name: Run Dagger Pipelines
-        run: fluentci run gradle_pipeline
+        run: |
+          dagger query --doc check.gql
+          dagger query --doc test.gql
+          dagger query --doc build.gql
+        working-directory: example

README.md

@@ -43,21 +43,20 @@ fluentci
 | test   | Run the tests       |
 | build  | Build the project   |
 
+```graphql
+build(src: String!): String
+check(src: String!): String
+test(src: String!): String
+```
+
 ## Programmatic usage
 
 You can also use this pipeline programmatically:
 
 ```ts
-import Client, { connect } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
-import { check, test, build } from "https://pkg.fluentci.io/gradle_pipeline@v0.3.1/mod.ts";
-
-function pipeline(src = ".") {
-  connect(async (client: Client) => {
-    await check(client, src);
-    await test(client, src);
-    await build(client, src);
-  });
-}
-
-pipeline();
+import { check, test, build } from "https://pkg.fluentci.io/gradle_pipeline@v0.4.0/mod.ts";
+
+await check();
+await test();
+await build();
 ```

ci.ts

@@ -1,16 +1,9 @@
-import Client, { connect } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
 import {
   check,
   test,
   build,
-} from "https://pkg.fluentci.io/gradle_pipeline@v0.3.1/mod.ts";
+} from "https://pkg.fluentci.io/gradle_pipeline@v0.4.0/mod.ts";
 
-function pipeline(src = ".") {
-  connect(async (client: Client) => {
-    await check(client, src);
-    await test(client, src);
-    await build(client, src);
-  });
-}
-
-pipeline();
+await check();
+await test();
+await build();

dagger.json

@@ -0,0 +1,5 @@
+{
+  "root": "",
+  "name": "gradle",
+  "sdkRuntime": "tsiry/dagger-sdk-deno"
+}

deno.json

@@ -3,15 +3,29 @@
   "tasks": {
     "esm:add": "deno run -A https://esm.sh/v128 add",
     "esm:update": "deno run -A https://esm.sh/v128 update",
-    "esm:remove": "deno run -A https://esm.sh/v128 remove"
+    "esm:remove": "deno run -A https://esm.sh/v128 remove",
+    "schema": "deno run -A src/dagger/schema.ts",
+    "clean": "rm -rf gen schema.graphql"
   },
   "fmt": {
-    "exclude": ["example/", ".fluentci/"]
+    "exclude": [
+      "example/",
+      ".fluentci/",
+      "gen/"
+    ]
   },
   "lint": {
-    "exclude": ["example/", ".fluentci/"]
+    "exclude": [
+      "example/",
+      ".fluentci/",
+      "gen/"
+    ]
   },
   "test": {
-    "exclude": ["example/", ".fluentci/"]
+    "exclude": [
+      "example/",
+      ".fluentci/",
+      "gen/"
+    ]
   }
-}
+}

deps.ts

@@ -1,11 +1,31 @@
 export { assertEquals } from "https://deno.land/std@0.191.0/testing/asserts.ts";
-import Client from "https://sdk.fluentci.io/v0.1.9/mod.ts";
+import Client from "https://sdk.fluentci.io/z1/mod.ts";
 export default Client;
 
-export { connect, uploadContext } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
+export {
+  connect,
+  uploadContext,
+  CacheSharingMode,
+} from "https://sdk.fluentci.io/z1/mod.ts";
 export { brightGreen } from "https://deno.land/std@0.191.0/fmt/colors.ts";
-export { withDevbox } from "https://nix.fluentci.io/v0.5.1/src/dagger/steps.ts";
+export { withDevbox } from "https://nix.fluentci.io/zenith/src/dagger/steps.ts";
 export { stringifyTree } from "https://esm.sh/stringify-tree@1.1.1";
+import gql from "https://esm.sh/graphql-tag@2.12.6";
+export { gql };
+
+export {
+  arg,
+  queryType,
+  stringArg,
+  intArg,
+  nonNull,
+  makeSchema,
+} from "npm:nexus";
+export {
+  dirname,
+  join,
+  resolve,
+} from "https://deno.land/std@0.203.0/path/mod.ts";
 
 export * as FluentGitlabCI from "https://deno.land/x/fluent_gitlab_ci@v0.4.2/mod.ts";
 export * as FluentGithubActions from "https://deno.land/x/fluent_github_actions@v0.2.1/mod.ts";

example/.fluentci/example/.fluentci/example/.fluentci/fixtures/workflow.yml → example/.fluentci/.github/workflows/zenith.yml

@@ -1,24 +1,24 @@
 # Do not edit this file directly. It is generated by https://deno.land/x/fluent_github_actions
 
-name: build
+name: Zenith Example
 on:
   push:
     branches:
-      - main
+      - zenith
+
 jobs:
-  build:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.37
-      - name: Setup Fluent CI CLI
-        run: deno install -A -r https://cli.fluentci.io -n fluentci
-      - name: Setup Dagger
+      - name: Setup Dagger Zenith
         run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
           sudo mv bin/dagger /usr/local/bin
           dagger version
       - name: Run Dagger Pipelines
-        run: fluentci run gradle_pipeline
+        run: |
+          dagger query --doc check.gql
+          dagger query --doc test.gql
+          dagger query --doc build.gql
+        working-directory: example

example/.fluentci/README.md

@@ -48,16 +48,9 @@ fluentci
 You can also use this pipeline programmatically:
 
 ```ts
-import Client, { connect } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
-import { check, test, build } from "https://pkg.fluentci.io/gradle_pipeline@v0.3.1/mod.ts";
-
-function pipeline(src = ".") {
-  connect(async (client: Client) => {
-    await check(client, src);
-    await test(client, src);
-    await build(client, src);
-  });
-}
-
-pipeline();
+import { check, test, build } from "https://pkg.fluentci.io/gradle_pipeline@v0.4.0/mod.ts";
+
+await check();
+await test();
+await build();
 ```

example/.fluentci/dagger.json

@@ -0,0 +1,5 @@
+{
+  "root": "",
+  "name": "gradle",
+  "sdkRuntime": "tsiry/dagger-sdk-deno"
+}