Skip to content

Commit

Permalink
ci: update node etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
jankapunkt committed Mar 14, 2024
1 parent c608d1f commit 4bac412
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 50 deletions.
51 changes: 12 additions & 39 deletions .github/workflows/lint_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,20 @@ on:
pull_request:

jobs:
audit:
name: Javascript lint
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2

- name: setup node
uses: actions/setup-node@v1
with:
node-version: '12.x'

- name: cache dependencies
uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-leaonline-accounts
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: npm ci

- name: Run audit
run: npm audit --production --audit-level=high

lintcode:
name: Javascript lint
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: 20

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -68,15 +41,15 @@ jobs:
needs: [lintcode]
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: 20

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -96,15 +69,15 @@ jobs:
needs: [lintcode,lintstyle]
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: 20

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
21 changes: 10 additions & 11 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,37 @@ on:
pull_request:

jobs:

tests:
name: Meteor ${{ matrix.meteor }} tests
runs-on: ubuntu-latest
steps:

# CHECKOUTS
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Checkout leaonline:testing repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: leaonline/testing
path: github/testing

- name: Checkout leaonline:utils repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: leaonline/utils
path: github/utils

- name: Checkout leaonline:theme repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: leaonline/theme
path: github/theme

# CACHING
- name: Install Meteor
id: cache-meteor-install
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.meteor
key: v1-meteor-${{ hashFiles('.meteor/versions') }}
Expand All @@ -48,7 +47,7 @@ jobs:
- name: Cache NPM dependencies
id: cache-meteor-npm
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: v1-npm-${{ hashFiles('package-lock.json') }}
Expand All @@ -57,7 +56,7 @@ jobs:
- name: Cache Meteor build
id: cache-meteor-build
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
.meteor/local/resolver-result-cache.json
Expand All @@ -71,13 +70,13 @@ jobs:
- name: Setup meteor
uses: meteorengineer/setup-meteor@v1
with:
meteor-release: '2.1.1'
meteor-release: '2.9.1'

- name: Install NPM Dependencies
run: meteor npm ci

- name: Run Tests
run: sh ./test.sh -c
run: sh ./test.sh -c -o

- name: Upload coverage
uses: actions/upload-artifact@v2
Expand All @@ -91,7 +90,7 @@ jobs:
needs: [tests]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Download coverage
uses: actions/download-artifact@v2
Expand Down

0 comments on commit 4bac412

Please sign in to comment.