Skip to content
Permalink
Browse files

[Docker] use gcc to build

  • Loading branch information
3nids committed Aug 21, 2020
1 parent 5d897d8 commit a2cdc4bc8025f820136d985eee77814f937eb30b
Showing with 7 additions and 7 deletions.
  1. +3 −3 .docker/qgis.dockerfile
  2. +4 −4 .github/workflows/build-docker.yml
@@ -11,8 +11,8 @@ LABEL Description="Docker container with QGIS" Vendor="QGIS.org" Version="1.1"
# build timeout in seconds, so no timeout by default
ARG BUILD_TIMEOUT=360000

ARG CC=/usr/lib/ccache/clang
ARG CXX=/usr/lib/ccache/clazy
ARG CC=/usr/lib/ccache/gcc
ARG CXX=/usr/lib/ccache/g++
ENV LANG=C.UTF-8

COPY . /QGIS
@@ -55,7 +55,7 @@ RUN cmake \
&& SUCCESS=OK \
&& timeout ${BUILD_TIMEOUT}s ninja install || SUCCESS=TIMEOUT \
&& echo "$SUCCESS" > /QGIS/build_exit_value

# Additional run-time dependencies
RUN pip3 install jinja2 pygments

@@ -3,9 +3,9 @@ name: Build QGIS Docker images for current branches
on:
schedule:
# runs every day
# - cron: '0 0 * * *'
- cron: '0 0 * * *'
# every hour
- cron: '*/5 * * * *'
- cron: '* */1 * * *'

jobs:
build-docker:
@@ -18,6 +18,8 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
CC=/usr/lib/ccache/gcc
CXX=/usr/lib/ccache/g++ # Building SIP binding freezes with Clang in Docker, maybe a SIP issue, maybe not

strategy:
matrix:
@@ -42,8 +44,6 @@ jobs:
run: |
DOCKER_TAG=${branch//master/latest}
DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-focal.dockerfile
CC=/usr/lib/ccache/gcc
CXX=/usr/lib/ccache/g++ # Building SIP binding freezes with Clang in Docker, maybe a SIP issue, maybe not
echo "branch: ${branch}"
echo "docker tag: ${DOCKER_TAG}"

0 comments on commit a2cdc4b

Please sign in to comment.
You can’t perform that action at this time.