Remove yarn and update ci actions

josh-cooper · Jun 4, 2024 · 944ca36 · 944ca36
1 parent a558ed2
commit 944ca36
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
@@ -10,21 +10,19 @@ env:
 
 jobs:
   build:
-    if: github.event.workflow_run.conclusion == 'success'
     permissions: write-all
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "16"
-          cache: "yarn"
+          node-version: "18.x"
 
       - name: Install Dependencies
-        run: yarn install
+        run: npm install
 
       - name: Extract version number
         id: extract_version

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,16 +13,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "20"
-          cache: "yarn"
+          node-version: "18.x"
 
       - name: Install Dependencies
-        run: yarn install
+        run: npm install
+
+      - name: Install xvfb
+        run: xvfb-run -a npm test
 
       - name: Run Tests
-        run: yarn test
+        run: npm test
diff --git a/.yarnrc b/.yarnrc
diff --git a/package.json b/package.json
@@ -56,15 +56,15 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "yarn run package",
-    "compile": "yarn run check-types && yarn run lint && node esbuild.js",
+    "vscode:prepublish": "npm run package",
+    "compile": "npm run check-types && npm run lint && node esbuild.js",
     "watch": "npm-run-all -p watch:*",
     "watch:esbuild": "node esbuild.js --watch",
     "watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
-    "package": "yarn run check-types && yarn run lint && node esbuild.js --production",
+    "package": "npm run check-types && npm run lint && node esbuild.js --production",
     "compile-tests": "tsc -p . --outDir out",
     "watch-tests": "tsc -p . -w --outDir out",
-    "pretest": "yarn run compile-tests && yarn run compile && yarn run lint",
+    "pretest": "npm run compile-tests && npm run compile && npm run lint",
     "check-types": "tsc --noEmit",
     "lint": "eslint src --ext ts",
     "test": "vscode-test"