Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 - chore: remove js/scss build on backend from ci #649

Merged
merged 3 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ jobs:
python-version: '3.12'
optimize-postgres: 'yes'
pg-service: 'postgres'
setup-node: 'yes'
npm-ci-flags: '--legacy-peer-deps'
setup-node: 'no'
working-directory: backend
nvmrc-custom-dir: backend

- name: Run tests
working-directory: backend
Expand Down Expand Up @@ -200,11 +198,9 @@ jobs:
python-version: '3.12'
optimize-postgres: 'yes'
pg-service: 'postgres'
setup-node: 'yes'
npm-ci-flags: '--legacy-peer-deps'
setup-node: 'no'
working-directory: backend
nvmrc-custom-dir: backend


- name: Start CI docker services
run: |
docker compose up -d
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,6 @@ jobs:
echo '| :--- | ---- | ------ | :---- |' >> $GITHUB_STEP_SUMMARY
python ./bin/flake8_summary.py "${{ steps.flake8.outputs.FLAKE8_REPORT }}" >> $GITHUB_STEP_SUMMARY


# ui-prettier:
# name: Check frontend code formatting with prettier
# runs-on: ubuntu-latest
#
# defaults:
# run:
# working-directory: ui
#
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v3
# with:
# node-version-file: 'ui/.nvmrc'
#
# - name: Install dependencies
# run: npm ci --legacy-peer-deps
#
# - name: Run prettier linter
# run: npm run checkformat

migrations:
name: Check for model changes not present in migrations
runs-on: ubuntu-latest
Expand Down
21 changes: 3 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,7 @@ RUN pip install uv -U
COPY ./backend/requirements /app/requirements
RUN uv pip install --system -r requirements/production.txt

# Stage 2 - Build JS of the backend (needed for admin styles)
FROM node:20-bullseye-slim AS backend-js-build

WORKDIR /app

COPY ./backend/build /app/build/
COPY ./backend/*.json ./backend/*.js /app/

RUN npm ci

COPY ./backend/src /app/src

RUN npm run build

# Stage 3 - Build the Front end
# Stage 2 - Build the Front end
FROM node:20-bullseye-slim AS frontend-build

RUN mkdir /frontend
Expand All @@ -50,10 +36,10 @@ COPY ./frontend/.env.production.template ./.env.production

RUN npm run build

# Stage 4 - Build docker image suitable for production
# Stage 3 - Build docker image suitable for production
FROM python:3.12-slim-bullseye

# Stage 4.1 - Set up the needed production dependencies
# Stage 3.1 - Set up the needed production dependencies
# install all the dependencies for GeoDjango
RUN apt-get update && apt-get install -y --no-install-recommends \
procps \
Expand Down Expand Up @@ -83,7 +69,6 @@ COPY --from=backend-build /usr/local/bin/celery /usr/local/bin/celery

COPY ./backend/src /app/src

COPY --from=backend-js-build /app/src/openarchiefbeheer/static/bundles /app/src/openarchiefbeheer/static/bundles
COPY --from=frontend-build /frontend/build /app/src/openarchiefbeheer/static/frontend
COPY --from=frontend-build /frontend/build/static/css /app/src/openarchiefbeheer/static/css
COPY --from=frontend-build /frontend/build/static/js /app/src/openarchiefbeheer/static/js
Expand Down
1 change: 0 additions & 1 deletion backend/.nvmrc

This file was deleted.

118 changes: 0 additions & 118 deletions backend/Dockerfile

This file was deleted.

47 changes: 0 additions & 47 deletions backend/build/paths.js

This file was deleted.

57 changes: 0 additions & 57 deletions backend/karma.conf.js

This file was deleted.

Loading
Loading