Skip to content

Commit

Permalink
fix(WIP): remove buildx + add explicit yarn build
Browse files Browse the repository at this point in the history
  • Loading branch information
alee committed Nov 21, 2023
1 parent b3b62cf commit 06c051d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/frontend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up docker buildx
uses: docker/setup-buildx-action@v2
- name: build container
run: |
make docker-compose.yml
docker compose build vite --pull
docker compose build vite --pull --no-cache
docker compose up vite -d
- name: Lint
run: docker compose exec vite yarn lint
Expand All @@ -31,6 +29,9 @@ jobs:
- name: Type check
if: ${{ success() || failure() }}
run: docker compose exec vite yarn type-check
- name: Build for production
if: ${{ success() || failure() }}
run: docker compose exec vite yarn build
- name: bring down container
if: ${{ always() }}
run: docker compose down
2 changes: 1 addition & 1 deletion django/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ shortuuid==1.0.11
tzdata==2023.3
uwsgi==2.0.23
uwsgitop==0.11
wagtail==5.2
wagtail==5.2.1
# used for institution -> affiliation data migration, unused afterwards
fuzzywuzzy==0.18.0
invoke
Expand Down
4 changes: 2 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ WORKDIR /code
COPY package.json yarn.lock /code/
RUN set -ex; \
if [ "$NODE_ENV" = "production" ]; then \
yarn install --no-cache --frozen-lockfile --production; \
yarn workspaces focus --production; \
elif [ "$NODE_ENV" = "test" ] || [ "$NODE_ENV" = "e2e" ]; then \
yarn install --no-cache --frozen-lockfile; \
yarn install --immutable; \
else \
yarn install; \
fi
Expand Down

0 comments on commit 06c051d

Please sign in to comment.