Skip to content

Commit 47f6ed6

Browse files
authored
chores (#1598)
A bunch of chores
1 parent 9c64b2a commit 47f6ed6

File tree

10 files changed

+470
-191
lines changed

10 files changed

+470
-191
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-node@v3
1515
with:
1616
node-version: 18
17-
- run: yarn install
17+
- run: npm install
1818
- name: Run tests
1919
uses: GabrielBB/[email protected]
2020
with:
@@ -26,11 +26,11 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v3
2828
- run: node $SCRIPT_DIR/enableWebpack.js
29-
- run: yarn install
30-
- uses: lannonbr/vsce-action@master
29+
- run: npm install
30+
- uses: lannonbr/vsce-action@4.0.0
3131
with:
3232
args: "package -o $VSIX_FILE"
33-
- uses: actions/upload-artifact@v3
33+
- uses: actions/upload-artifact@v4
3434
with:
3535
name: ${{ env.VSIX_FILE }}
3636
path: ${{ env.VSIX_FILE }}
@@ -41,8 +41,8 @@ jobs:
4141
- uses: actions/setup-node@v3
4242
with:
4343
node-version: 18
44-
- run: yarn install
45-
- run: yarn run lint
44+
- run: npm install
45+
- run: npm run lint
4646
markdownlint-cli:
4747
runs-on: ubuntu-latest
4848
steps:
@@ -52,31 +52,33 @@ jobs:
5252
files: .
5353
config_file: ".markdownlint.json"
5454
ignore_files: "node_modules/*"
55-
lintr:
55+
lint:
5656
runs-on: ubuntu-latest
57-
container:
58-
image: rocker/tidyverse:latest
57+
env:
58+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
5959
steps:
60-
- uses: actions/checkout@v3
61-
- name: Install apt-get dependencies
62-
run: |
63-
apt-get update
64-
apt-get install git ssh curl bzip2 -y
60+
- uses: actions/checkout@v4
61+
62+
- uses: r-lib/actions/setup-r@v2
63+
with:
64+
use-public-rspm: true
65+
6566
- name: Install lintr
66-
run: |
67-
Rscript -e "install.packages('lintr', repos = 'https://cloud.r-project.org')"
68-
shell: bash
69-
- name: Running lintr
70-
run: |
71-
Rscript -e "stopifnot(length(print(lintr::lint_dir('./R'))) == 0)"
72-
shell: bash
67+
run: install.packages("lintr")
68+
shell: Rscript {0}
69+
70+
- name: Lint root directory
71+
run: lintr::lint_dir("./R")
72+
shell: Rscript {0}
73+
env:
74+
LINTR_ERROR_ON_LINT: true
7375
devreplay:
7476
runs-on: ubuntu-latest
7577
steps:
7678
- uses: actions/checkout@v3
7779
- uses: actions/setup-node@v3
7880
with:
7981
node-version: 18
80-
- run: yarn install
82+
- run: npm install
8183
- name: Run devreplay
8284
run: ./node_modules/.bin/devreplay ./src devreplay.json

.github/workflows/pre-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818
- run: node $SCRIPT_DIR/enableWebpack.js
19-
- run: yarn install
20-
- uses: lannonbr/vsce-action@master
19+
- run: npm install
20+
- uses: lannonbr/vsce-action@4.0.0
2121
with:
2222
args: "package -o $FILE_OUT"
23-
- uses: actions/upload-artifact@v3
23+
- uses: actions/upload-artifact@v4
2424
with:
2525
name: "${{ env.FILE_OUT }}"
2626
path: "${{ env.FILE_OUT }}"

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818
- run: node $SCRIPT_DIR/enableWebpack.js
19-
- run: yarn install
20-
- uses: lannonbr/vsce-action@master
19+
- run: npm install
20+
- uses: lannonbr/vsce-action@4.0.0
2121
with:
2222
args: "package"
2323
- name: Identify output file # can be retrieved as steps.filenames.outputs.file_out
2424
id: filenames
2525
run: echo "::set-output name=file_out::$(ls | grep "^.*\.vsix$" | head -1)"
26-
- uses: actions/upload-artifact@v3
26+
- uses: actions/upload-artifact@v4
2727
with:
2828
name: ${{ steps.filenames.outputs.file_out }}
2929
path: ${{ steps.filenames.outputs.file_out }}
@@ -57,7 +57,7 @@ jobs:
5757
steps:
5858
- uses: actions/checkout@v3
5959
- run: node $SCRIPT_DIR/enableWebpack.js
60-
- run: yarn install
60+
- run: npm install
6161
- name: Publish to Open VSX Registry
6262
uses: HaaLeo/publish-vscode-extension@v1
6363
id: publishToOpenVSX

.vscode/extensions.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
{
2-
"recommendations": [
3-
"dbaeumer.vscode-eslint",
4-
"GrapeCity.gc-excelviewer",
5-
"ikuyadeu.devreplay",
6-
"DavidAnson.vscode-markdownlint"
7-
]
2+
83
}

.vscode/tasks.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"command": "vsce",
1111
"args": [
1212
"package",
13-
"--yarn",
1413
"-o",
1514
"${workspaceFolderBasename}.vsix"
1615
]

.yarnrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

R/.lintr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
linters: linters_with_defaults(
22
line_length_linter(120),
33
indentation_linter(4),
4-
cyclocomp_linter = NULL,
4+
return_linter = NULL,
55
object_name_linter = NULL,
66
object_usage_linter = NULL)

0 commit comments

Comments
 (0)