diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29bdea0..910d227 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - name: Install env: - SKIP_POSTINSTALL: true + UPLOAD_SCHEMA: true run: nci - name: Lint diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 7632a8c..d284bfa 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -31,7 +31,7 @@ jobs: # - name: Install eemoji # run: pnpm i -g eemoji - + - name: Install eemoji env: SKIP_POSTINSTALL: true @@ -41,16 +41,10 @@ jobs: run: pnpm run build - name: Setup eemoji - run: pnpm i - - - name: Link eemoji - run: pnpm link --global - - - name: Print eemoji version - run: eemoji --version + run: node ./bin/eemoji.mjs init -c none - name: Print ls - run: ls -la + run: ls -la .git/hooks - name: Switch to test branch run: git checkout -b test @@ -67,4 +61,6 @@ jobs: run: 'git commit --allow-empty -m ''test: eemoji''' - name: Check the commit message for emoji - run: git log -1 --pretty=%B | grep -q "👍" + run: | + git log -1 + git log -1 --pretty=%B | grep -q "👍" diff --git a/bin/postinstall.cjs b/bin/postinstall.cjs index 6aa0e27..102b693 100644 --- a/bin/postinstall.cjs +++ b/bin/postinstall.cjs @@ -1,23 +1,20 @@ const process = require('node:process') const fs = require('node:fs') const exec = require('node:child_process').exec -const platform = require('node:os').platform() -if (process.env.SKIP_POSTINSTALL) { - if (platform === 'linux') { - const schema = require('./../json/eemoji-config-schema.json') - const emojis = require('./../src/emojis.json') +if (process.env.UPLOAD_SCHEMA) { + const schema = require('./../json/eemoji-config-schema.json') + const emojis = require('./../src/emojis.json') - schema.properties.emojis.default = emojis + schema.properties.emojis.default = emojis - fs.writeFileSync('./json/eemoji-config-schema.json', `${JSON.stringify(schema, null, 2)}\n`) - } + fs.writeFileSync('./json/eemoji-config-schema.json', `${JSON.stringify(schema, null, 2)}\n`) } -else { +else if (!process.env.SKIP_POSTINSTALL) { exec('node ./bin/eemoji.mjs init -c none', (err, stdout) => { if (err) console.error(err) - else + elsenode ./bin/eemoji.mjs init -c none console.log(stdout) }) }