Skip to content

Commit

Permalink
merge latest from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ekraffmiller committed Nov 2, 2023
2 parents f324074 + 1212e31 commit 5a927c4
Show file tree
Hide file tree
Showing 70 changed files with 2,245 additions and 628 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,23 @@ jobs:
- name: Run e2e tests
run: npm run test:e2e

- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2
with:
dest: './logs'

- name: Tar logs
if: failure()
run: tar cvzf ./logs.tgz ./logs

- name: Upload logs to GitHub
if: failure()
uses: actions/upload-artifact@master
with:
name: logs.tgz
path: ./logs.tgz

component:
runs-on: ubuntu-latest

Expand Down
11 changes: 11 additions & 0 deletions dev-env/docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ services:
mem_reservation: 1024m
privileged: false

dv_initializer:
container_name: 'dv_initializer'
image: gdcc/configbaker:unstable
restart: 'no'
command:
- sh
- -c
- 'fix-fs-perms.sh dv'
volumes:
- ./docker-dev-volumes/app/data:/dv

dev_dataverse_bootstrap:
container_name: 'dev_dataverse_bootstrap'
image: gdcc/configbaker:unstable
Expand Down
1 change: 1 addition & 0 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RUN apk --no-cache add python3 make g++

WORKDIR /usr/src/app/packages/design-system
COPY ./packages/design-system ./
COPY package-lock.json ./
RUN npm install
RUN npm run build

Expand Down
Loading

0 comments on commit 5a927c4

Please sign in to comment.