Skip to content

Commit

Permalink
Optimizination attempt #1
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke Brody committed Aug 15, 2024
1 parent a43afab commit 880194d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,6 @@ jobs:
container:
image: ghcr.io/${{ needs.build-and-push-image.outputs.image_tag }}
steps:
- uses: actions/checkout@v4
- run: git clone --progress --depth 1 https://github.com/densitydb/densitydb.github.io.git /density-db
- run: /urbanstats/test-ci.sh
13 changes: 4 additions & 9 deletions react/test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
FROM ubuntu:22.04
FROM node:20

RUN dpkg --add-architecture i386
RUN apt-get -y update
RUN apt-get -y install python3-pip
RUN apt-get -y install libgdal-dev

WORKDIR /urbanstats
COPY ./requirements.txt ./
RUN pip3 install --break-system-packages -r requirements.txt

RUN apt-get -y install chromium
RUN apt-get -y install xvfb

RUN git clone --progress --depth 1 https://github.com/densitydb/densitydb.github.io.git ../density-db

# needed for window resizing in Testcafe
RUN dpkg --add-architecture i386
RUN apt-get -y update
RUN apt-get -y install libc6:i386
RUN apt-get -y install libx11-6:i386
RUN apt-get -y install fluxbox

COPY ./ ./
COPY ./requirements.txt ./
RUN pip3 install --break-system-packages -r requirements.txt

ENTRYPOINT [ "/bin/bash" ]
7 changes: 3 additions & 4 deletions test-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@

set -e

cd /urbanstats
echo "GITHUB_WORKSPACE $GITHUB_WORKSPACE"

pushd ../density-db
git fetch --depth 1 origin # cloned in docker
cd /density-db
git checkout origin
git checkout origin/$BRANCH_NAME || true # Checkout the same branch name on the remote, if it exists. BRANCH_NAME defined in workflow env

python3 -m http.server &

popd
cd $GITHUB_WORKSPACE
python3 create_website.py ../density-db --no-data --no-geo --no-juxta

# Start display subsystem to browser can run
Expand Down

0 comments on commit 880194d

Please sign in to comment.