Merge pull request #161 from bluecadet/fix/ci-workflow

update and tweak actions
bluecadet · Oct 14, 2024 · 93d8033 · 93d8033
2 parents afc809f + 63e22a7
commit 93d8033
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,14 +2,11 @@ name: Main
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
     branches:
       - develop
-      - main
   push:
     branches:
       - develop
-      - main
   merge_group:
 
 concurrency:
@@ -24,13 +21,14 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version-file: 'package.json'
+          cache: 'npm'
 
       - name: Install Dependencies
-        run: npm install
+        run: npm ci
 
       - name: Run eslint
         run: npm run lint

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,16 +12,14 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-
-      - name: Setup Node.js 18.x
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
-
+          node-version-file: 'package.json'
+          cache: 'npm'
+
       - name: Install Dependencies
-        run: npm install
+        run: npm ci
 
       - name: Create Release Pull Request or Publish to npm
         id: changesets
@@ -31,9 +29,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Update main branch if a publish happens
-        if: steps.changesets.outputs.published == 'true'
-        run: |
-          git fetch --unshallow
-          git push origin develop:main