hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 09:31:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

e2e tests: rely on yarn to find web-ext and jest

Browse source
This commit is contained in:
glacambre 2020-05-27 18:53:19 +02:00
parent 53b2746108
commit 7bc33c2645
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/e2e.yml vendored
View file

@ -8,9 +8,6 @@ on:
branches: branches:
- '*' - '*'
env:
HEADLESS: 1
jobs: jobs:
test: test:
strategy: strategy:
@ -57,19 +54,16 @@ jobs:
run: | run: |
choco install firefox-dev --pre choco install firefox-dev --pre
echo "::add-path::C:\Program Files\Firefox Dev Edition" echo "::add-path::C:\Program Files\Firefox Dev Edition"
- name: Build Tridactyl - name: Pack Tridactyl
run: | run: |
bash -c '"$(yarn bin)/web-ext" build --source-dir ./build --overwrite-dest' yarn make-zip
mv web-ext-artifacts/*.zip web-ext-artifacts/tridactyl.xpi mv web-ext-artifacts/*.zip web-ext-artifacts/tridactyl.xpi
- name: Test (Firefox) - name: Test (Firefox)
if: matrix.browser != 'chrome' if: matrix.browser != 'chrome'
env: env:
HEADLESS: 1 HEADLESS: 1
run: | run: |
bash -c '"$(yarn bin)/jest" || yarn jest || yarn jest || yarn jest || yarn jest
"$(yarn bin)/jest" ||
"$(yarn bin)/jest" ||
"$(yarn bin)/jest"'
# - name: Test (Chrome, Linux) # - name: Test (Chrome, Linux)
# if: matrix.browser == 'chrome' && matrix.os == 'ubuntu' # if: matrix.browser == 'chrome' && matrix.os == 'ubuntu'
# run: xvfb-run --auto-servernum npm run jest -- ${{ matrix.browser }} || xvfb-run --auto-servernum npm run jest -- ${{ matrix.browser }} # run: xvfb-run --auto-servernum npm run jest -- ${{ matrix.browser }} || xvfb-run --auto-servernum npm run jest -- ${{ matrix.browser }}

12
package.json
View file

@ -52,14 +52,16 @@
}, },
"scripts": { "scripts": {
"build": "sh scripts/build.sh", "build": "sh scripts/build.sh",
"run": "web-ext run -s build/ -u 'txti.es'",
"forrest-run": "yarn run run",
"watch": "echo 'watch is broken, use build instead'; exit 0;",
"clean": "rm -rf build generated", "clean": "rm -rf build generated",
"forrest-run": "yarn run run",
"jest": "jest",
"lint": "bash hooks/pre-commit",
"make-zip": "web-ext build --source-dir build --overwrite-dest",
"pretty": "bash scripts/pretty.sh",
"run": "web-ext run -s build/ -u 'txti.es'",
"test": "yarn run build && rm -rf web-ext-artifacts/* && web-ext build --source-dir ./build --overwrite-dest && mv web-ext-artifacts/*.zip web-ext-artifacts/tridactyl.xpi && jest --silent", "test": "yarn run build && rm -rf web-ext-artifacts/* && web-ext build --source-dir ./build --overwrite-dest && mv web-ext-artifacts/*.zip web-ext-artifacts/tridactyl.xpi && jest --silent",
"update-buildsystem": "rm -rf src/node_modules; yarn run clean", "update-buildsystem": "rm -rf src/node_modules; yarn run clean",
"lint": "bash hooks/pre-commit", "watch": "echo 'watch is broken, use build instead'; exit 0;"
"pretty": "bash scripts/pretty.sh"
}, },
"author": "Colin Caine", "author": "Colin Caine",
"repository": { "repository": {