Skip to content

Commit

Permalink
Add codecov build stats
Browse files Browse the repository at this point in the history
switch to ESM only
switch to actions/checkout@v4
add vite CI
add a retry on redis connection for integration tests
bump GUI dependencies
  • Loading branch information
Hugo-C committed Mar 23, 2024
1 parent 025aff8 commit ff75ae4
Show file tree
Hide file tree
Showing 9 changed files with 831 additions and 515 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build GUI image
run: docker build jarm_online_gui/ --build-arg VUE_APP_SENTRY_DSN=${{secrets.VUE_APP_SENTRY_DSN}} -t jarm_online_gui
- name: Build API image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run playwright test
run: docker compose -f docker-compose.playwright.yml run pytest_runner
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: rustcache
uses: Swatinem/rust-cache@v2
- name: Build
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/vite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Vite

concurrency: production

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build npm/vite to send codecov stats
working-directory: ./jarm_online_gui
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
run: |
npm install
npm run build
4 changes: 3 additions & 1 deletion jarm_online_gui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Taken from https://cli.vuejs.org/guide/deployment.html#docker-nginx
FROM node:20 as build-stage
ARG VUE_APP_SENTRY_DSN
RUN echo "Sentry dsn set to $VUE_APP_SENTRY_DSN"
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY ./ .
RUN npm run build

FROM nginx:stable-alpine as production-stage
ARG VUE_APP_SENTRY_DSN
ENV VUE_APP_SENTRY_DSN=${VUE_APP_SENTRY_DSN}
RUN echo "Sentry dsn set to $VUE_APP_SENTRY_DSN"
RUN mkdir /app
COPY --from=build-stage /app/dist /app
COPY nginx.conf /etc/nginx/nginx.conf
Expand Down
Loading

0 comments on commit ff75ae4

Please sign in to comment.