Skip to content

Commit

Permalink
Added github actions for tag. Remove appveyor logging (to keep e2e te…
Browse files Browse the repository at this point in the history
…st open so no timeout). Tidy up.
  • Loading branch information
mattRedBox committed Nov 25, 2021
1 parent 53fa252 commit eebfa38
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: github-actions-to-ci-branches
name: ci
on:
push:
branches:
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: release
on:
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+
jobs:
ci:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- windows-2019
- macos-11
node_version:
- '14.x'
name: OS ${{ matrix.os }} with node ${{ matrix.node_version }}
steps:
- name: Setup git
if: ${{ runner.os == 'Windows' }}
run: git config --global core.autocrlf input
- uses: actions/checkout@v2
- name: Install
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node_version }}
- run: |
yarn
node --version
yarn autoclean --force
yarn run clean
- name: Lint
run: yarn run lint
- name: Release predraft
run: yarn run release:predraft
1 change: 0 additions & 1 deletion Untitled0.csv

This file was deleted.

38 changes: 0 additions & 38 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,41 +102,3 @@ for:
build: off
deploy: off
configuration: Test
-
matrix:
only:
- job_name: Windows build
branches:
only:
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
init:
- git config --global core.autocrlf input
install:
- ps: Install-Product node $env:nodejs_version $env:plat
- choco upgrade yarn
- git reset --hard HEAD
- yarn
- node --version
- yarn autoclean --force
- yarn run clean
test: off
build_script:
- ps: if ($env:APPVEYOR_REPO_TAG -eq "true") { yarn run release:predraft }
configuration: Release
-
matrix:
only:
- job_name: Macosx build
branches:
only:
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
install:
- brew update && brew install yarn
- yarn
- node --version
- yarn autoclean --force
- yarn run clean
test: off
build_script:
- ps: if ($env:APPVEYOR_REPO_TAG -eq "true") { yarn run release:predraft }
configuration: Release
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"scripts": {
"build": "node --trace-warnings .electron-vue/build.js && electron-builder",
"build:sign:win:code": "node .electron-vue/build.js && electron-builder --config.win.sign=signWinCode.js",
"sign:win:installer": "cross-env node ./signWinInstaller.js",
"build:sign:win:all": "cross-env yarn run build:sign:win:code && yarn run sign:win:installer",
"build:sign:mac:macappstore": "cross-env yarn run build -c.mac.target=mas && bash build/resignAndPackage.sh",
"build:post": "cross-env node ./postbuild.js",
"build:dir": "node .electron-vue/build.js && electron-builder --dir -c.mac.identity=null",
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
"clean": "cross-env BUILD_TARGET=cleanAll node .electron-vue/build.js",
"sign:win:installer": "cross-env node ./signWinInstaller.js",
"dev": "node --trace-warnings .electron-vue/dev-runner.js",
"lint": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly src test",
"lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly --fix src test",
Expand Down
4 changes: 2 additions & 2 deletions test/features/support/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ async function stopAppRunning (app) {
}
}

// function tallyTestE2E (testCase) {
// function tallyTestAppveyor (testCase) {
// if (process.env.APPVEYOR) {
// console.log('e2e tally...')
// exec(`appveyor AddTest -Name ${testCase.pickle.name} -Framework Spectron -Filename ${testCase.sourceLocation.uri} -Outcome ${testCase.result.status} -Duration ${testCase.result.duration}`, (error, stdout, stderr) => {
Expand All @@ -40,7 +40,7 @@ After({ timeout: 40000 }, async function (testCase) {
await this.attach(imageBuffer, 'image/png')
}
}
// tallyTestE2E(testCase)
// tallyTestAppveyor(testCase)
} catch (error) {
console.log('error in after hook', error)
} finally {
Expand Down
4 changes: 2 additions & 2 deletions test/features/support/page-objects/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export async function waitForVisibleIdFromLabel (app, parentSelector, label, tim
await el.waitforDisplayed(timeout)
return el
} catch (error) {
console.log(`Unable to find via ${kebabCase} Trying ${camelCase}...`)
console.log(`Unable to find via ID kebabCase Trying ID camelCase...`)
const el = await app.client.$(`${parentSelector} #${camelCase}`)
await waitForDisplayedDefault(el)
return el
Expand All @@ -22,7 +22,7 @@ export async function returnInputIdSelector (app, selector) {
try {
return app.client.$(`input#${kebabCase}`)
} catch (error) {
console.log(`Unable to find via ${kebabCase} Trying ${camelCase}`)
console.log(`Unable to find via ID kebabCase Trying ID camelCase...`)
return app.client.$(`input#${camelCase}`)
}
}
Expand Down

0 comments on commit eebfa38

Please sign in to comment.