Skip to content

Commit

Permalink
Merge branch 'master' into en
Browse files Browse the repository at this point in the history
  • Loading branch information
aeifn committed May 14, 2024
2 parents 01d7203 + 159f819 commit d7363c2
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 5 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Docker Image CI
on:
push:
branches:
- '**'
- 'master'
- 'en'
tags:
- 'v*'
workflow_dispatch:
Expand All @@ -28,10 +29,14 @@ jobs:
run: |
npm version --no-git-tag-version $(node -p "require('./package.json').version")-en-${GITHUB_SHA::8}
- name: Install dependencies
run: npm ci

- name: Test
run: npm run test

- name: Build
run: |
npm ci
npm run build
run: npm run build

#- name: Sentry
# env:
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Pull request CI test

on:
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0

- name: Install dependencies
run: npm ci

- name: Test
run: npm run test

- name: Build
run: npm run build
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ module.exports = function (grunt) {
'exec:testNodeVersion:.nvmrc',
'exec:testNodeVersionDockerfile:./.docker/Dockerfile',
'exec:testNodeVersionDockerfile:./.docker/backend.Dockerfile',
'exec:testNodeVersionDockerfile:./.docker/frontend.Dockerfile',
'eslint',
'stylelint',
'exec:jest',
Expand Down

0 comments on commit d7363c2

Please sign in to comment.