From 3dbb7581ea4d5a2e2ccddf44e15ab61203d830f9 Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Sun, 26 Mar 2023 20:05:05 +0900 Subject: [PATCH 01/11] feat: Add "dagger:textlint:reviewdog" command --- .github/workflows/linter-textlint-dagger.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linter-textlint-dagger.yml b/.github/workflows/linter-textlint-dagger.yml index c6a38a4..e8aafcd 100644 --- a/.github/workflows/linter-textlint-dagger.yml +++ b/.github/workflows/linter-textlint-dagger.yml @@ -13,7 +13,7 @@ jobs: node-version: 18 - name: Run npm install run: npm install - - name: Reviewdog Install + - name: reviewdog Install run: curl -sfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh| sh -s -- -b ./bin - name: Run textlint on Dagger env: diff --git a/package.json b/package.json index 680c720..8ea2721 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "lint:sarif": "eslint -f @microsoft/eslint-formatter-sarif -o eslint_results.sarif '{src/**/*,*}.{js,ts,jsx,tsx,vue}'", "textlint": "textlint -f compact src/**/*.md || true", "dagger:textlint": "node --loader ts-node/esm ./.dagger/textlint.ts", + "dagger:textlint:reviewdog": "node --loader ts-node/esm ./.dagger/textlint-with-reviewdog.ts", "dagger:eslint": "node --loader ts-node/esm ./.dagger/eslint.ts" }, "keywords": [ From 20aacfd0e7d010ef69186c2b28b61df3bf9ae3aa Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Tue, 28 Mar 2023 20:47:19 +0900 Subject: [PATCH 02/11] feat: Add "dagger:textlint:reviewdog" command --- .../textlint-with-reviewdog.ts | 14 ++++++------ package.json | 22 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) rename build.ts => .dagger/textlint-with-reviewdog.ts (60%) diff --git a/build.ts b/.dagger/textlint-with-reviewdog.ts similarity index 60% rename from build.ts rename to .dagger/textlint-with-reviewdog.ts index a74e3ba..7916243 100644 --- a/build.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -2,20 +2,20 @@ import Client, { connect } from '@dagger.io/dagger'; // initialize Dagger client connect(async (client: Client) => { - // get Node image - // get Node version - // const node = client.container().from('bitnami/node:18').withExec(['node', '-v']); const source = client.host().directory('.', { exclude: ['node_modules/'] }); const node = client.container().from('bitnami/node:18') .withExec(['corepack', 'enable', 'pnpm']) - .withExec(['corepack', 'prepare', 'pnpm@latest', '--activate']); + .withExec(['corepack', 'prepare', 'pnpm@latest', '--activate']) + .withExec(['apt-get', 'update']) + .withExec(['apt-get', 'install', 'git']) + .withExec(['curl', '-sfLO', 'https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh']) + .withExec(['sh', 'install.sh']); // textlint - const runner = client - .container({ id: node }) + const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) - .withExec(['pnpm', 'run', 'textlint']); + .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute const textlintResult = await runner.stdout(); diff --git a/package.json b/package.json index 8ea2721..f6ce059 100644 --- a/package.json +++ b/package.json @@ -18,27 +18,27 @@ "author": "naoyukik", "license": "MIT", "devDependencies": { - "@dagger.io/dagger": "^0.3.0", - "@typescript-eslint/eslint-plugin": "^5.13.0", - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^8.2.0", + "@dagger.io/dagger": "^0.3.5", + "@typescript-eslint/eslint-plugin": "^5.56.0", + "@typescript-eslint/parser": "^5.56.0", + "eslint": "^8.36.0", "eslint-config-airbnb": "19.0.4", "eslint-config-airbnb-typescript": "^17.0.0", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-jsx-a11y": "^6.5.1", - "eslint-plugin-react": "^7.28.0", - "eslint-plugin-react-hooks": "^4.3.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react-hooks": "^4.6.0", "install-peerdeps": "^3.0.3", - "textlint": "^12.2.1", + "textlint": "^12.6.1", "textlint-rule-ja-hiragana-fukushi": "^1.3.0", - "textlint-rule-ja-hiragana-hojodoushi": "^1.0.4", + "textlint-rule-ja-hiragana-hojodoushi": "^1.1.0", "textlint-rule-ja-hiragana-keishikimeishi": "^1.1.0", "textlint-rule-ja-no-redundant-expression": "^4.0.1", "textlint-rule-ja-no-weak-phrase": "^2.0.0", "textlint-rule-preset-jtf-style": "^2.3.13", "textlint-rule-prh": "^5.3.0", "ts-node": "^10.9.1", - "typescript": "^4.8.4" + "typescript": "^4.9.5" }, "volta": { "node": "16.19.0" From 4af2362c13f4dcd43d808928ee2600d623c2d08f Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Thu, 30 Mar 2023 20:07:56 +0900 Subject: [PATCH 03/11] feat: exec "dagger:textlint:reviewdog" command on GitHub Actions --- .dagger/textlint-with-reviewdog.ts | 4 +++- .github/workflows/linter-textlint-dagger.yml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 7916243..53fb008 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -15,7 +15,9 @@ connect(async (client: Client) => { const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) - .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); + .withExec(['printenv']) + // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); + // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute const textlintResult = await runner.stdout(); diff --git a/.github/workflows/linter-textlint-dagger.yml b/.github/workflows/linter-textlint-dagger.yml index e8aafcd..c720a85 100644 --- a/.github/workflows/linter-textlint-dagger.yml +++ b/.github/workflows/linter-textlint-dagger.yml @@ -19,3 +19,16 @@ jobs: env: REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./bin/reviewdog -conf=./.reviewdog.yml -runners=textlint_dagger -reporter=github-check -filter-mode=nofilter + textlint_on_dagger: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Run npm install + run: npm install + - name: Run textlint on Dagger + env: + REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: npm run dagger:textlint:reviewdog From aba91a4f8eda8ce12543b4994d67c2c3feec67f2 Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Mon, 8 May 2023 13:27:43 +0900 Subject: [PATCH 04/11] fix: Changed environment variables for reviewdog to be called on command line - dagger update to package.json --- .dagger/textlint-with-reviewdog.ts | 9 +++++++-- package.json | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 53fb008..a48abd0 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -1,7 +1,11 @@ import Client, { connect } from '@dagger.io/dagger'; +// import { Secret } from '@dagger.io/dagger/dist/api/client.gen' // initialize Dagger client connect(async (client: Client) => { + // read secret from host variable + // const secret: Secret = client.setSecret("gh-secret", process.env["GH_SECRET"]) + const source = client.host().directory('.', { exclude: ['node_modules/'] }); const node = client.container().from('bitnami/node:18') .withExec(['corepack', 'enable', 'pnpm']) @@ -15,8 +19,9 @@ connect(async (client: Client) => { const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) - .withExec(['printenv']) - // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); + // .withExec(['echo', process.env["GH_SECRET"]]) + // .withExec(['printenv']) + .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute diff --git a/package.json b/package.json index f6ce059..3300f10 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ "author": "naoyukik", "license": "MIT", "devDependencies": { - "@dagger.io/dagger": "^0.3.5", - "@typescript-eslint/eslint-plugin": "^5.56.0", - "@typescript-eslint/parser": "^5.56.0", - "eslint": "^8.36.0", + "@dagger.io/dagger": "^0.5.1", + "@typescript-eslint/eslint-plugin": "^5.59.2", + "@typescript-eslint/parser": "^5.59.2", + "eslint": "^8.40.0", "eslint-config-airbnb": "19.0.4", "eslint-config-airbnb-typescript": "^17.0.0", "eslint-plugin-import": "^2.27.5", From 1e7c1719bed4b2d071dec64dfa0d67e08a9c336f Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Mon, 8 May 2023 21:41:52 +0900 Subject: [PATCH 05/11] fix: Changed environment variables for reviewdog to be called on command line --- .dagger/textlint-with-reviewdog.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index a48abd0..7362701 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -21,7 +21,8 @@ connect(async (client: Client) => { .withExec(['pnpm', 'install']) // .withExec(['echo', process.env["GH_SECRET"]]) // .withExec(['printenv']) - .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); + // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); + .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute From 6c5a09f57e44ff7b818ea714614d3e8476d90ca8 Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Mon, 8 May 2023 21:54:07 +0900 Subject: [PATCH 06/11] fix: Changed environment variables for reviewdog to be called on command line --- .dagger/textlint-with-reviewdog.ts | 7 ++++--- .dagger/textlint.ts | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 7362701..4fe8173 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -1,10 +1,10 @@ import Client, { connect } from '@dagger.io/dagger'; -// import { Secret } from '@dagger.io/dagger/dist/api/client.gen' +import { Secret } from '@dagger.io/dagger/dist/api/client.gen' // initialize Dagger client connect(async (client: Client) => { // read secret from host variable - // const secret: Secret = client.setSecret("gh-secret", process.env["GH_SECRET"]) + const secret: Secret = client.setSecret("gh-secret", process.env["GH_SECRET"]) const source = client.host().directory('.', { exclude: ['node_modules/'] }); const node = client.container().from('bitnami/node:18') @@ -19,10 +19,11 @@ connect(async (client: Client) => { const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) + .withSecretVariable('GITHUB_API_TOKEN', secret) // .withExec(['echo', process.env["GH_SECRET"]]) // .withExec(['printenv']) // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); - .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); + .withExec(["REVIEWDOG_GITHUB_API_TOKEN=$GITHUB_API_TOKEN", './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute diff --git a/.dagger/textlint.ts b/.dagger/textlint.ts index 84f4bcf..1b6673a 100644 --- a/.dagger/textlint.ts +++ b/.dagger/textlint.ts @@ -8,8 +8,7 @@ connect(async (client: Client) => { .withExec(['corepack', 'prepare', 'pnpm@latest', '--activate']); // textlint - const runner = client - .container({ id: node }) + const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) .withExec(['pnpm', 'run', 'textlint']); From 5d3f75b7f20a18d463238559768427af67dd237f Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Mon, 8 May 2023 22:02:20 +0900 Subject: [PATCH 07/11] fix: Changed environment variables for reviewdog to be called on command line --- .dagger/textlint-with-reviewdog.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 4fe8173..0bf5494 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -4,7 +4,8 @@ import { Secret } from '@dagger.io/dagger/dist/api/client.gen' // initialize Dagger client connect(async (client: Client) => { // read secret from host variable - const secret: Secret = client.setSecret("gh-secret", process.env["GH_SECRET"]) + // const secret: Secret = client.setSecret("gh-secret", process.env["GH_SECRET"]) + const secret: Secret = client.setSecret("reviewdog-secret", process.env["REVIEWDOG_GITHUB_API_TOKEN"]) const source = client.host().directory('.', { exclude: ['node_modules/'] }); const node = client.container().from('bitnami/node:18') @@ -19,11 +20,11 @@ connect(async (client: Client) => { const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) - .withSecretVariable('GITHUB_API_TOKEN', secret) - // .withExec(['echo', process.env["GH_SECRET"]]) + .withSecretVariable('GITHUB_TOKEN', secret) + .withExec(['echo', process.env["REVIEWDOG_GITHUB_API_TOKEN"]]) // .withExec(['printenv']) // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); - .withExec(["REVIEWDOG_GITHUB_API_TOKEN=$GITHUB_API_TOKEN", './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); + // .withExec(["REVIEWDOG_GITHUB_API_TOKEN=$GITHUB_TOKEN", './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute From 4820e97b5a7f911b69d50e51091896c26d68f73c Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Mon, 8 May 2023 22:05:54 +0900 Subject: [PATCH 08/11] fix: Changed environment variables for reviewdog to be called on command line --- .dagger/textlint-with-reviewdog.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 0bf5494..40b99a4 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -21,7 +21,7 @@ connect(async (client: Client) => { .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) .withSecretVariable('GITHUB_TOKEN', secret) - .withExec(['echo', process.env["REVIEWDOG_GITHUB_API_TOKEN"]]) + .withExec(['echo', "$GITHUB_TOKEN"]) // .withExec(['printenv']) // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(["REVIEWDOG_GITHUB_API_TOKEN=$GITHUB_TOKEN", './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); From da2c5d8400addd234a849ce51cfc1dbcfc94ea48 Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Mon, 8 May 2023 22:14:00 +0900 Subject: [PATCH 09/11] fix: Changed environment variables for reviewdog to be called on command line --- .dagger/textlint-with-reviewdog.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 40b99a4..62558e4 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -1,11 +1,11 @@ import Client, { connect } from '@dagger.io/dagger'; -import { Secret } from '@dagger.io/dagger/dist/api/client.gen' +// import { Secret } from '@dagger.io/dagger/dist/api/client.gen' // initialize Dagger client connect(async (client: Client) => { // read secret from host variable // const secret: Secret = client.setSecret("gh-secret", process.env["GH_SECRET"]) - const secret: Secret = client.setSecret("reviewdog-secret", process.env["REVIEWDOG_GITHUB_API_TOKEN"]) + // const secret: Secret = client.setSecret("reviewdog-secret", process.env["REVIEWDOG_GITHUB_API_TOKEN"]) const source = client.host().directory('.', { exclude: ['node_modules/'] }); const node = client.container().from('bitnami/node:18') @@ -20,11 +20,12 @@ connect(async (client: Client) => { const runner = node .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) - .withSecretVariable('GITHUB_TOKEN', secret) - .withExec(['echo', "$GITHUB_TOKEN"]) + // .withSecretVariable('GITHUB_TOKEN', secret) + // .withExec(['echo', "$GITHUB_TOKEN"]) + .withEnvVariable('REVIEWDOG_GITHUB_API_TOKEN', process.env["REVIEWDOG_GITHUB_API_TOKEN"]) // .withExec(['printenv']) // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); - // .withExec(["REVIEWDOG_GITHUB_API_TOKEN=$GITHUB_TOKEN", './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); + .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute From 082e9eecc152308b7f6ce0ed820fca9160017fb6 Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Fri, 12 May 2023 21:46:44 +0900 Subject: [PATCH 10/11] fix: Add environment variables for reviewdog --- .dagger/textlint-with-reviewdog.ts | 13 +++++++++---- .github/workflows/linter-textlint-dagger.yml | 7 +++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index 62558e4..e72a8ca 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -21,10 +21,14 @@ connect(async (client: Client) => { .withMountedDirectory('/app', source) .withExec(['pnpm', 'install']) // .withSecretVariable('GITHUB_TOKEN', secret) - // .withExec(['echo', "$GITHUB_TOKEN"]) - .withEnvVariable('REVIEWDOG_GITHUB_API_TOKEN', process.env["REVIEWDOG_GITHUB_API_TOKEN"]) - // .withExec(['printenv']) - // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint_dagger', '-reporter=github-check', '-filter-mode=nofilter']); + .withEnvVariable('REVIEWDOG_GITHUB_API_TOKEN', process.env["GITHUB_API_TOKEN"]) + .withEnvVariable('CI_REPO_OWNER', process.env["CI_REPO_OWNER"]) + .withEnvVariable('CI_REPO_NAME', process.env["CI_REPO_NAME"]) + .withEnvVariable('CI_COMMIT', process.env["CI_COMMIT"]) + // .withExec(['echo', process.env["GITHUB_API_TOKEN"]]) + // .withExec(['echo', process.env["github"]]) + // .withEnvVariable('REVIEWDOG_GITHUB_API_TOKEN', process.env["GITHUB_API_TOKEN"]) + // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); @@ -34,3 +38,4 @@ connect(async (client: Client) => { // print output console.log(textlintResult); }); + diff --git a/.github/workflows/linter-textlint-dagger.yml b/.github/workflows/linter-textlint-dagger.yml index c720a85..7ed8b7d 100644 --- a/.github/workflows/linter-textlint-dagger.yml +++ b/.github/workflows/linter-textlint-dagger.yml @@ -19,7 +19,7 @@ jobs: env: REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./bin/reviewdog -conf=./.reviewdog.yml -runners=textlint_dagger -reporter=github-check -filter-mode=nofilter - textlint_on_dagger: + textlint_with_reviewdog_on_dagger: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -30,5 +30,8 @@ jobs: run: npm install - name: Run textlint on Dagger env: - REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CI_REPO_OWNER: ${{ github.repository_owner }} + CI_REPO_NAME: ${{ github.event.repository.name }} + CI_COMMIT: ${{ github.sha }} run: npm run dagger:textlint:reviewdog From 582b126cb55f76365a56192531ad1c836a3eaf52 Mon Sep 17 00:00:00 2001 From: Kodama Naoyuki Date: Sun, 4 Jun 2023 21:12:16 +0900 Subject: [PATCH 11/11] chore: pending --- .dagger/textlint-with-reviewdog.ts | 2 +- .github/workflows/linter-textlint-dagger.yml | 4 ++-- src/TextlintSample.md | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.dagger/textlint-with-reviewdog.ts b/.dagger/textlint-with-reviewdog.ts index e72a8ca..25f1365 100644 --- a/.dagger/textlint-with-reviewdog.ts +++ b/.dagger/textlint-with-reviewdog.ts @@ -29,7 +29,7 @@ connect(async (client: Client) => { // .withExec(['echo', process.env["github"]]) // .withEnvVariable('REVIEWDOG_GITHUB_API_TOKEN', process.env["GITHUB_API_TOKEN"]) // .withExec(['REVIEWDOG_GITHUB_API_TOKEN=' + process.env["REVIEWDOG_GITHUB_API_TOKEN"], './bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); - .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter']); + .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-reporter=github-check', '-filter-mode=nofilter', '-tee']); // .withExec(['./bin/reviewdog', '-conf=./.reviewdog.yml', '-runners=textlint', '-diff=/usr/bin/git diff main']); // execute diff --git a/.github/workflows/linter-textlint-dagger.yml b/.github/workflows/linter-textlint-dagger.yml index 7ed8b7d..554384c 100644 --- a/.github/workflows/linter-textlint-dagger.yml +++ b/.github/workflows/linter-textlint-dagger.yml @@ -32,6 +32,6 @@ jobs: env: GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} CI_REPO_OWNER: ${{ github.repository_owner }} - CI_REPO_NAME: ${{ github.event.repository.name }} + CI_REPO_NAME: custom-rules-for-static-code-analysis CI_COMMIT: ${{ github.sha }} - run: npm run dagger:textlint:reviewdog + run: node --loader ts-node/esm ./.dagger/textlint-with-reviewdog.ts diff --git a/src/TextlintSample.md b/src/TextlintSample.md index 0ee96e4..aeed547 100644 --- a/src/TextlintSample.md +++ b/src/TextlintSample.md @@ -13,3 +13,22 @@ JTF 標準 〜かもしれない 予め + +github + +予め +JTF 標準 + +これは，見本となる例です． + +概ね + +〜する上(で) + +〜して頂く + +～することが可能である + +〜かもしれない + +予め