Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps 2024 oct #1251

Merged
merged 11 commits into from
Oct 24, 2024
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
test-cypress-slack-reporter-old:
docker:
# the Docker image with Cypress dependencies
- image: cypress/base:17.8.0
- image: cypress/base:20.18.0
environment:
## this enables colors in the output
TERM: xterm
Expand All @@ -23,6 +23,9 @@ jobs:
paths:
- ~/.npm
- ~/.cache
- run:
name: deps
command: apt-get update && apt-get install -y make
- run:
when: always
name: Lint project
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-cypress-multi-reporters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
node-version: [18.x, 20.x, 22.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/build-cypress-slack-reporter-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [14.x, 16.x, 18.x]
node-version: [18.x, 20.x, 22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
Expand All @@ -40,14 +40,14 @@ jobs:
- run: make test
- run: make combine-reports && make generate-report
- name: get artifacts 1
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output-1
name: test-output-1-${{matrix.node-version}}
path: |
cypress/reports
cypress/videos
cypress/screenshots
mochareports
cypress-slack-reporter-old/cypress/reports
cypress-slack-reporter-old/cypress/videos
cypress-slack-reporter-old/cypress/screenshots
cypress-slack-reporter-old/mochareports
- run: npm run slack-ts
- run: npm run slack-js
- run: npm run slack-ts-opts
Expand All @@ -57,9 +57,9 @@ jobs:
- run: npm run slack-js-opts-build-failed
- run: npm run cli
- name: get artifacts 2
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output-2
name: test-output-2-${{matrix.node-version}}
path: |
src/slack/test
cypress/reports/mocha
cypress-slack-reporter-old/src/slack/test
cypress-slack-reporter-old/cypress/reports/mocha
10 changes: 5 additions & 5 deletions .github/workflows/publish-cypress-multi-reporters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: 'https://registry.npmjs.org'
cache-dependency-path: cypress-multi-reporters/yarn.lock
- id: publish
Expand All @@ -28,12 +28,12 @@ jobs:
NODE_AUTH_TOKEN: ${{secrets.NPM_AUTOMATION_TOKEN}}
- name: Create Release
id: create_release
uses: actions/create-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: v${{ steps.publish.outputs.version }}
release_name: Release v${{ steps.publish.outputs.version }}
name: Release v${{ steps.publish.outputs.version }}
body: ${{steps.publish.outputs.notes}}
draft: false
prerelease: false
10 changes: 5 additions & 5 deletions .github/workflows/publish-cypress-slack-reporter-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: 'https://registry.npmjs.org'
cache-dependency-path: cypress-slack-reporter-old/yarn.lock
- id: publish
Expand All @@ -33,12 +33,12 @@ jobs:
NODE_AUTH_TOKEN: ${{secrets.NPM_AUTOMATION_TOKEN}}
- name: Create Release
id: create_release
uses: actions/create-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: v${{ steps.publish.outputs.version }}
release_name: Release v${{ steps.publish.outputs.version }}
name: Release v${{ steps.publish.outputs.version }}
body: ${{steps.publish.outputs.notes}}
draft: false
prerelease: false
7 changes: 0 additions & 7 deletions cypress-multi-reporters/.eslintignore

This file was deleted.

37 changes: 0 additions & 37 deletions cypress-multi-reporters/.eslintrc.js

This file was deleted.

8 changes: 4 additions & 4 deletions cypress-multi-reporters/.ncurc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

module.exports = {
// Whitelist all for checking besides `peer` which indicates
// somewhat older versions of `eslint` we still support even
// while our devDeps point to a more recent version
"dep": "prod,dev,optional,bundle"
// Whitelist all for checking besides `peer` which indicates
// somewhat older versions of `eslint` we still support even
// while our devDeps point to a more recent version
dep: 'prod,dev,optional,bundle'
};
3 changes: 2 additions & 1 deletion cypress-multi-reporters/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ coverage
cypress-multi-reporters.tar.gz
renovate.json
.editorconfig
.ncurc.js
.ncurc.js
eslint.config.mjs
42 changes: 42 additions & 0 deletions cypress-multi-reporters/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
"use strict";
import js from "@eslint/js";
import globals from "globals";

export default [
js.configs.recommended, // Recommended config applied to all files
{
languageOptions: {
sourceType: "commonjs",
ecmaVersion: 2015,
globals: {
...globals.node,
...globals.mocha,
...globals.mocha,
expect: true,
},
},
ignores: [
".editorconfig",
"artifacts/",
"coverage/",
"node_modules/",
"lcov-*",
"xunit*",
"eslint.config.mjs",
],
rules: {
"brace-style": [2, "stroustrup", { allowSingleLine: true }],
"no-console": 0,
strict: [2],
indent: [2, 4],
semi: ["error"],
"prefer-const": ["error"],
"no-var": ["error"],
"prefer-destructuring": ["error"],
"object-shorthand": ["error"],
quotes: ["error", "single"],
"quote-props": ["error", "as-needed"],
"prefer-template": ["error"],
},
},
];
1 change: 1 addition & 0 deletions cypress-multi-reporters/lib/MultiReporters.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ try {
mocha6plus = false;
}
}
// eslint-disable-next-line no-unused-vars
catch (e) {
// istanbul ignore next
console.warn('Couldn\'t determine Mocha version');
Expand Down
Loading
Loading