diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index efe0d4e3..5e54eeb1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,7 +3,8 @@ name: Docker Image CI on: push: branches: - - '**' + - 'master' + - 'en' tags: - 'v*' workflow_dispatch: @@ -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: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 00000000..24f3305a --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -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 diff --git a/Gruntfile.js b/Gruntfile.js index bfeae75e..61c2a56a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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',