Skip to content

Commit fe9563f

Browse files
authored
Merge pull request #1251 from YOU54F/deps_2024_oct
Deps 2024 oct
2 parents 0f8457a + e7bcf02 commit fe9563f

26 files changed

+4627
-14978
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test-cypress-slack-reporter-old:
55
docker:
66
# the Docker image with Cypress dependencies
7-
- image: cypress/base:17.8.0
7+
- image: cypress/base:20.18.0
88
environment:
99
## this enables colors in the output
1010
TERM: xterm
@@ -23,6 +23,9 @@ jobs:
2323
paths:
2424
- ~/.npm
2525
- ~/.cache
26+
- run:
27+
name: deps
28+
command: apt-get update && apt-get install -y make
2629
- run:
2730
when: always
2831
name: Lint project

.github/workflows/build-cypress-multi-reporters.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [14.x, 16.x, 18.x]
19+
node-version: [18.x, 20.x, 22.x]
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v3
24+
uses: actions/setup-node@v4
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
cache: 'yarn'

.github/workflows/build-cypress-slack-reporter-old.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
node-version: [14.x, 16.x, 18.x]
24+
node-version: [18.x, 20.x, 22.x]
2525
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2626

2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
- name: Use Node.js ${{ matrix.node-version }}
30-
uses: actions/setup-node@v3
30+
uses: actions/setup-node@v4
3131
with:
3232
node-version: ${{ matrix.node-version }}
3333
cache: 'yarn'
@@ -40,14 +40,14 @@ jobs:
4040
- run: make test
4141
- run: make combine-reports && make generate-report
4242
- name: get artifacts 1
43-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
4444
with:
45-
name: test-output-1
45+
name: test-output-1-${{matrix.node-version}}
4646
path: |
47-
cypress/reports
48-
cypress/videos
49-
cypress/screenshots
50-
mochareports
47+
cypress-slack-reporter-old/cypress/reports
48+
cypress-slack-reporter-old/cypress/videos
49+
cypress-slack-reporter-old/cypress/screenshots
50+
cypress-slack-reporter-old/mochareports
5151
- run: npm run slack-ts
5252
- run: npm run slack-js
5353
- run: npm run slack-ts-opts
@@ -57,9 +57,9 @@ jobs:
5757
- run: npm run slack-js-opts-build-failed
5858
- run: npm run cli
5959
- name: get artifacts 2
60-
uses: actions/upload-artifact@v3
60+
uses: actions/upload-artifact@v4
6161
with:
62-
name: test-output-2
62+
name: test-output-2-${{matrix.node-version}}
6363
path: |
64-
src/slack/test
65-
cypress/reports/mocha
64+
cypress-slack-reporter-old/src/slack/test
65+
cypress-slack-reporter-old/cypress/reports/mocha

.github/workflows/publish-cypress-multi-reporters.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
release:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20-
- uses: actions/setup-node@v3
20+
- uses: actions/setup-node@v4
2121
with:
22-
node-version: 16
22+
node-version: 20
2323
registry-url: 'https://registry.npmjs.org'
2424
cache-dependency-path: cypress-multi-reporters/yarn.lock
2525
- id: publish
@@ -28,12 +28,12 @@ jobs:
2828
NODE_AUTH_TOKEN: ${{secrets.NPM_AUTOMATION_TOKEN}}
2929
- name: Create Release
3030
id: create_release
31-
uses: actions/create-release@v1
31+
uses: softprops/action-gh-release@v2
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
3434
with:
3535
tag_name: v${{ steps.publish.outputs.version }}
36-
release_name: Release v${{ steps.publish.outputs.version }}
36+
name: Release v${{ steps.publish.outputs.version }}
3737
body: ${{steps.publish.outputs.notes}}
3838
draft: false
3939
prerelease: false

.github/workflows/publish-cypress-slack-reporter-old.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
release:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
25-
- uses: actions/setup-node@v3
25+
- uses: actions/setup-node@v4
2626
with:
27-
node-version: 16
27+
node-version: 20
2828
registry-url: 'https://registry.npmjs.org'
2929
cache-dependency-path: cypress-slack-reporter-old/yarn.lock
3030
- id: publish
@@ -33,12 +33,12 @@ jobs:
3333
NODE_AUTH_TOKEN: ${{secrets.NPM_AUTOMATION_TOKEN}}
3434
- name: Create Release
3535
id: create_release
36-
uses: actions/create-release@v1
36+
uses: softprops/action-gh-release@v2
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
3939
with:
4040
tag_name: v${{ steps.publish.outputs.version }}
41-
release_name: Release v${{ steps.publish.outputs.version }}
41+
name: Release v${{ steps.publish.outputs.version }}
4242
body: ${{steps.publish.outputs.notes}}
4343
draft: false
4444
prerelease: false

cypress-multi-reporters/.eslintignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

cypress-multi-reporters/.eslintrc.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

cypress-multi-reporters/.ncurc.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

33
module.exports = {
4-
// Whitelist all for checking besides `peer` which indicates
5-
// somewhat older versions of `eslint` we still support even
6-
// while our devDeps point to a more recent version
7-
"dep": "prod,dev,optional,bundle"
4+
// Whitelist all for checking besides `peer` which indicates
5+
// somewhat older versions of `eslint` we still support even
6+
// while our devDeps point to a more recent version
7+
dep: 'prod,dev,optional,bundle'
88
};

cypress-multi-reporters/.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ coverage
1616
cypress-multi-reporters.tar.gz
1717
renovate.json
1818
.editorconfig
19-
.ncurc.js
19+
.ncurc.js
20+
eslint.config.mjs
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
"use strict";
2+
import js from "@eslint/js";
3+
import globals from "globals";
4+
5+
export default [
6+
js.configs.recommended, // Recommended config applied to all files
7+
{
8+
languageOptions: {
9+
sourceType: "commonjs",
10+
ecmaVersion: 2015,
11+
globals: {
12+
...globals.node,
13+
...globals.mocha,
14+
...globals.mocha,
15+
expect: true,
16+
},
17+
},
18+
ignores: [
19+
".editorconfig",
20+
"artifacts/",
21+
"coverage/",
22+
"node_modules/",
23+
"lcov-*",
24+
"xunit*",
25+
"eslint.config.mjs",
26+
],
27+
rules: {
28+
"brace-style": [2, "stroustrup", { allowSingleLine: true }],
29+
"no-console": 0,
30+
strict: [2],
31+
indent: [2, 4],
32+
semi: ["error"],
33+
"prefer-const": ["error"],
34+
"no-var": ["error"],
35+
"prefer-destructuring": ["error"],
36+
"object-shorthand": ["error"],
37+
quotes: ["error", "single"],
38+
"quote-props": ["error", "as-needed"],
39+
"prefer-template": ["error"],
40+
},
41+
},
42+
];

0 commit comments

Comments
 (0)