Skip to content

Commit

Permalink
[fix] Update git actions
Browse files Browse the repository at this point in the history
- Update actions in `ci.yml`
- Bump node version from 12 => 16
- Switch from `yarn` to `npm`
- Replace `loadimpact/har-to-k6` with `grafana/har-to-k6` in `package.json`
- Update `package.json~engines.node`
- Bump "unsafe" packages
  • Loading branch information
w1kman committed Oct 6, 2023
1 parent 1d555ee commit b335101
Show file tree
Hide file tree
Showing 7 changed files with 22,692 additions and 7,467 deletions.
24 changes: 9 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,23 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
env:
cache-name: node-modules
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
node-version: '16'
cache: 'npm'

- name: Install dependencies
run: yarn
run: npm ci

- name: Lint
run: yarn lint
- name: Lint files
run: npm run lint

- name: Bundle
run: yarn bundle
run: npm run bundle

- name: Test
run: yarn test
run: npm test

- name: Build Docker Image
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
npm-debug.log
package-lock.json
.bundle
NERD_*
tmp
Expand Down Expand Up @@ -38,3 +37,4 @@ loadtest.js

yarn-error.log
.idea
yarn.lock
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.0
v16
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM node:12-slim
FROM node:16-slim

WORKDIR /converter

COPY . .

RUN yarn
RUN yarn bundle
RUN npm install
RUN npm run bundle

ENTRYPOINT ["node", "bin/har-to-k6.js"]
Loading

0 comments on commit b335101

Please sign in to comment.