Skip to content

Commit

Permalink
Merge branch 'main' into stakeholders-table
Browse files Browse the repository at this point in the history
  • Loading branch information
mguetta1 authored Aug 26, 2024
2 parents 92e8984 + e551af8 commit 38b8a96
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ on:

workflow_call:

concurrency:
group: ci-repo-${{ github.event_name }}-${{ github.ref }}
cancel-in-progress: true

jobs:
unit-test-lookup-image:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -61,14 +65,14 @@ jobs:
run: npm run test -- --coverage --watchAll=false

- name: Upload to codecov (client)
if: ${{ github.event.pull_request }}
# if: ${{ github.event.pull_request }}
uses: codecov/codecov-action@v4
with:
flags: client
directory: ./client/coverage

- name: Upload to codecov (server)
if: ${{ github.event.pull_request }}
# if: ${{ github.event.pull_request }}
uses: codecov/codecov-action@v4
with:
flags: server
Expand Down
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ FROM registry.access.redhat.com/ubi9/nodejs-18:1-118 as builder

USER 1001
COPY --chown=1001 . .
RUN npm clean-install --ignore-scripts && npm run build && npm run dist
RUN npm version && \
npm config --location=project set fetch-retry-maxtimeout 300000 && \
npm config --location=project set fetch-retry-mintimeout 60000 && \
npm config --location=project set fetch-timeout 600000 && \
npm clean-install --verbose --ignore-scripts --no-audit && \
npm run build && \
npm run dist

# Runner image
FROM registry.access.redhat.com/ubi9/nodejs-18-minimal:1-123
Expand Down

0 comments on commit 38b8a96

Please sign in to comment.