Skip to content

Commit

Permalink
move artifacts to parent folder
Browse files Browse the repository at this point in the history
  • Loading branch information
cgeller authored Dec 19, 2023
1 parent a862007 commit 55ce918
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
repository: carla-compose/carla
latest: true
fileName: PythonAPI.tar.gz
out-file-path: artifacts
out-file-path: ../artifacts

- name: Extract PythonAPI
run: tar -xvzf artifacts/PythonAPI.tar.gz -C artifacts
run: tar -xvzf ../artifacts/PythonAPI.tar.gz -C ../artifacts

- uses: docker/build-push-action@v5
name: Build and push
Expand Down
3 changes: 1 addition & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ ARG UBUNTU_VERSION="22.04"


############ dependencies ############
ARG UBUNTU_VERSION
FROM "ubuntu:${UBUNTU_VERSION}" as dependencies

USER root
Expand Down Expand Up @@ -32,7 +31,7 @@ COPY . $SCENARIO_RUNNER_PATH
RUN pip3 install -r $SCENARIO_RUNNER_PATH/requirements.txt

# Copy over PythonAPI
COPY artifacts/PythonAPI ${CARLA_API_PATH}
COPY ../artifacts/PythonAPI ${CARLA_API_PATH}

# Recursively install PythonAPI requirements, keep version of first occurrence
RUN cat $(find ${CARLA_API_PATH} -type f -name "requirements.txt") > /tmp/requirements_raw.txt \
Expand Down

0 comments on commit 55ce918

Please sign in to comment.