Merge branch 'V2' into feature/v2/pageeditor-improved

This commit is contained in:
Anthony Stirling 2025-08-26 13:49:48 +01:00 committed by GitHub
commit cac79f195b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 49 additions and 5 deletions

View File

@ -270,6 +270,8 @@ jobs:
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
build-args: VERSION_TAG=v2-alpha build-args: VERSION_TAG=v2-alpha
platforms: linux/amd64 platforms: linux/amd64
secrets: |
npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
- name: Build and push V2 backend image - name: Build and push V2 backend image
if: steps.check-backend.outputs.exists == 'false' if: steps.check-backend.outputs.exists == 'false'

View File

@ -145,12 +145,18 @@ jobs:
node-version: '20' node-version: '20'
cache: 'npm' cache: 'npm'
cache-dependency-path: frontend/package-lock.json cache-dependency-path: frontend/package-lock.json
- name: Configure npm with token (if available)
if: secrets.NPM_TOKEN != ''
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install frontend dependencies - name: Install frontend dependencies
run: cd frontend && npm ci run: cd frontend && npm ci
- name: Build frontend - name: Build frontend
run: cd frontend && npm run build run: cd frontend && npm run build
- name: Run frontend tests - name: Run frontend tests
run: cd frontend && npm run test -- --run run: cd frontend && npm run test -- --run
- name: Clean up npmrc
if: always() && secrets.NPM_TOKEN != ''
run: rm -f ~/.npmrc
- name: Upload frontend build artifacts - name: Upload frontend build artifacts
uses: actions/upload-artifact@v4.6.2 uses: actions/upload-artifact@v4.6.2
with: with:

View File

@ -103,6 +103,8 @@ jobs:
${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest
build-args: VERSION_TAG=v2-alpha build-args: VERSION_TAG=v2-alpha
platforms: linux/amd64 platforms: linux/amd64
secrets: |
npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
- name: Build and push backend image - name: Build and push backend image
if: steps.check-backend.outputs.exists == 'false' if: steps.check-backend.outputs.exists == 'false'

View File

@ -51,6 +51,10 @@ jobs:
cache: 'npm' cache: 'npm'
cache-dependency-path: frontend/package-lock.json cache-dependency-path: frontend/package-lock.json
- name: Configure npm with token (if available)
if: secrets.NPM_TOKEN != ''
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install frontend dependencies - name: Install frontend dependencies
working-directory: frontend working-directory: frontend
run: npm ci run: npm ci
@ -59,6 +63,10 @@ jobs:
working-directory: frontend working-directory: frontend
run: npm run generate-licenses run: npm run generate-licenses
- name: Clean up npmrc
if: always() && secrets.NPM_TOKEN != ''
run: rm -f ~/.npmrc
- name: Check for license warnings - name: Check for license warnings
run: | run: |
if [ -f "frontend/src/assets/license-warnings.json" ]; then if [ -f "frontend/src/assets/license-warnings.json" ]; then

View File

@ -133,6 +133,10 @@ jobs:
with: with:
cache: 'npm' cache: 'npm'
- name: Configure npm with token (if available)
if: secrets.NPM_TOKEN != ''
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Run TestDriver.ai - name: Run TestDriver.ai
uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3 uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3
with: with:
@ -149,6 +153,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FORCE_COLOR: "3" FORCE_COLOR: "3"
- name: Clean up npmrc
if: always() && secrets.NPM_TOKEN != ''
run: rm -f ~/.npmrc
cleanup: cleanup:
needs: [deploy, test] needs: [deploy, test]
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -6,14 +6,32 @@ WORKDIR /app
# Copy package files # Copy package files
COPY frontend/package*.json ./ COPY frontend/package*.json ./
# Install dependencies # Install dependencies (uses .npmrc secret if available, otherwise anonymous)
RUN npm ci RUN --mount=type=secret,id=npmrc \
set -e && \
if [ -s /run/secrets/npmrc ]; then \
echo "Using authenticated npm registry" && \
echo "$(cat /run/secrets/npmrc)" > /root/.npmrc; \
else \
echo "Using anonymous npm registry (no token provided)"; \
fi && \
npm ci --loglevel=warn && \
rm -f /root/.npmrc
# Copy source code # Copy source code
COPY frontend . COPY frontend .
# Build the application # Build the application (uses .npmrc secret if available, otherwise anonymous)
RUN npm run build RUN --mount=type=secret,id=npmrc \
set -e && \
if [ -s /run/secrets/npmrc ]; then \
echo "Using authenticated npm registry for build" && \
echo "$(cat /run/secrets/npmrc)" > /root/.npmrc; \
else \
echo "Using anonymous npm registry for build (no token provided)"; \
fi && \
npm run build && \
rm -f /root/.npmrc
# Production stage # Production stage
FROM nginx:alpine FROM nginx:alpine