Skip to content

Commit

Permalink
Merge pull request #147 from dotnetCarpenter/deps
Browse files Browse the repository at this point in the history
Deps
  • Loading branch information
Tyriar authored Nov 19, 2024
2 parents e22394a + 2b2238f commit eaf02bb
Show file tree
Hide file tree
Showing 11 changed files with 4,094 additions and 2,742 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: yarn
cache-dependency-path: yarn.lock
cache: npm
- name: Install and build
run: |
yarn --frozen-lockfile
yarn compile
npm ci
npm run compile
env:
CI: true
- name: Test
run: yarn test
run: npm test
if: runner.os != 'Linux'
- name: Test on Linux
run: xvfb-run -a yarn test
run: xvfb-run -a npm test
if: runner.os == 'Linux'
- name: Lint
run: yarn lint
run: npm run lint
18 changes: 6 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,28 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 20.x
registry-url: 'https://npm.pkg.github.com'
- name: Cache yarn cache
uses: actions/cache@v4
with:
path: ~/.cache/yarn
key: ${{ runner.os }}-yarn-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
restore-keys: |
${{ runner.os }}-yarn-
cache: npm
- name: Install and build
run: yarn --frozen-lockfile
run: npm ci
env:
CI: true
- name: Build
run: yarn compile
run: npm run compile
env:
CI: true
- name: Build web
run: yarn package-web
run: npm run package-web
env:
CI: true
- name: Publish with vsce
run: |
npm i -g vsce
npm install --global @vscode/vsce
# Try to publish and ignore any errors (that version was already published)
vsce publish -p $VSCE_TOKEN || true
env:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dist/
node_modules/
out/
package-lock.json
.vscode-test/
*.vsix
yarn.lock
7 changes: 7 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';

export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.recommended,
);
10 changes: 0 additions & 10 deletions jsconfig.json

This file was deleted.

Loading

0 comments on commit eaf02bb

Please sign in to comment.