Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Mapotempo/optimizer-ortools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ab33c48283be071c5087f9eb2e84433eee691f1
Choose a base ref
..
head repository: Mapotempo/optimizer-ortools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8ea1b1d0feef35b2c43462c0fb18c54eb341621
Choose a head ref
Showing with 7 additions and 7 deletions.
  1. +1 −1 .github/workflows/main.yml
  2. +6 −6 Dockerfile
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ env:
jobs:
build_image:
runs-on: ubuntu-latest
timeout-minutes: 25
timeout-minutes: 60
steps:
- uses: actions/checkout@v1
- name: Build image
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -21,13 +21,13 @@ RUN curl 'https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.
cd .. && \
rm -R cmake-3.15.7 cmake.tar.gz

RUN cd /srv/or-tools && \
/usr/local/bin/cmake -S . -B build -DBUILD_DEPS=ON -DBUILD_PYTHON=ON && \
/usr/local/bin/cmake --build build --config Release --target install -v && \
cd .. && \
rm -R /srv/or-tools
WORKDIR /srv/or-tools
RUN /usr/local/bin/cmake -S . -B build -DBUILD_DEPS=ON -DBUILD_PYTHON=ON && \
/usr/local/bin/cmake --build build --config Release --target install -v

ADD . /srv/optimizer-ortools

WORKDIR /srv/optimizer-ortools
RUN make tsp_simple
RUN make tsp_simple && \
cd .. && \
rm -R /srv/or-tools