Skip to content

Commit f8572e4

Browse files
Merge pull request #55 from asieduernest12/fix/ci
Fix/ci
2 parents 7d89dcd + 4922097 commit f8572e4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ test: ## test
2929
build: ## build latest using version in bump.txt
3030
@rm -rf build;
3131
@pnpm gh:build;
32-
@echo "sleep 5 seconds"; seq 5 | xargs -I{} bash -c 'echo ".";sleep 1;';
32+
# @echo "sleep 5 seconds"; seq 5 | xargs -I{} bash -c 'echo ".";sleep 1;';
3333
@pnpm gh:build:development
34-
@sleep 10;make -s test
34+
@sleep 5;make -s test
3535

3636
extract: ## extract files
3737
rm -rf build/extracts

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"gh:build:opera": "TARGET=opera SHORTCUT=\"Alt+B\" MANIFEST_VERSION=chrome-mv3 npm run buildx && npm run bundle:opera",
2020
"gh:build:firefox": "TARGET=firefox SHORTCUT=\"Alt+W\" MANIFEST_VERSION=firefox-mv2 npm run buildx && npm run bundle:firefox",
2121
"gh:build:safari": "TARGET=safari SHORTCUT=\"Alt+W\" MANIFEST_VERSION=safari-mv2 npm run buildx && npm run bundle:safari",
22-
"gh:build": "echo 'TAG=prod NODE_ENV=production npm run gh:build:' | xargs -I{} bash -c '{}opera && {}chrome & {}firefox & {}safari && echo \"done...\"'",
23-
"gh:build:development": "echo 'TAG=dev NODE_ENV=development NAME=Jiffy-Reader-Dev npm run gh:build:' | xargs -I{} bash -c '{}opera && {}chrome & {}firefox & {}safari && echo \"done...\"'",
22+
"gh:build": "echo 'TAG=prod NODE_ENV=production npm run gh:build:' | xargs -I{} bash -c '{}opera && {}chrome & {}firefox & {}safari & wait'",
23+
"gh:build:development": "echo 'TAG=dev NODE_ENV=development NAME=Jiffy-Reader-Dev npm run gh:build:' | xargs -I{} bash -c '{}opera && {}chrome & {}firefox & {}safari & wait'",
2424
"gh:build:bookmarklet": "VERSION=\"$(npm pkg get version | tr -d '\"')\" node src/Bookmarklet/esbuild.mjs",
2525
"bundle": "npm run bundle:chrome & npm run bundle:firefix & npm run bundle:safari",
2626
"bundle:firefox": "cd build/firefox-mv2-prod/ && zip -r ../jiffyReader-firefox-$TAG.xpi ./*",
@@ -31,7 +31,7 @@
3131
"build:xcode": "pnpm build:safari && xcrun safari-web-extension-converter --swift --no-open --force --bundle-identifier com.jiffyreader build/safari-mv2-prod",
3232
"build:xcode:all": "pnpm build:xcode && pnpm build:ios",
3333
"dev:xcode": "xcrun safari-web-extension-converter --swift --no-open --force --bundle-identifier com.jiffyreader build/safari-mv2-dev",
34-
"release": "commit-and-tag-version"
34+
"release": "if [ 0 -eq $(git log --oneline | head -n1 | grep 'chore(release)' | wc -l) ]; then commit-and-tag-version; fi"
3535
},
3636
"dependencies": {
3737
"@plasmohq/prettier-plugin-sort-imports": "^1.1.1",

0 commit comments

Comments
 (0)