Skip to content
Snippets Groups Projects
Commit e9198124 authored by calrama's avatar calrama
Browse files

centos-7: Use newer git (2.18), include it in toolchain at front

parent 416eae3f
No related branches found
No related tags found
No related merge requests found
Pipeline #25195 passed
Stage: build
Stage: deploy
Pipeline: behavior_loader

#25198

    Pipeline: interfaces

    #25197

      Show whitespace changes
      Inline Side-by-side
      centos-7/Dockerfile
      + 2
      − 2
      View file @ e9198124
      ...@@ -9,8 +9,9 @@ ENV BASH_ENV "/etc/profile" ...@@ -9,8 +9,9 @@ ENV BASH_ENV "/etc/profile"
      RUN yum install -y centos-release-scl && \ RUN yum install -y centos-release-scl && \
      yum install -y epel-release && \ yum install -y epel-release && \
      yum install -y devtoolset-8 && \ yum install -y devtoolset-8 && \
      yum install -y rh-git218-git && \
      yum clean all yum clean all
      ADD bash/gcc-8.sh /etc/profile.d/gcc-8.sh ADD bash/toolchain.sh /etc/profile.d/toolchain.sh
      ADD bash/ld-library-path.sh /etc/profile.d/ld-library-path.sh ADD bash/ld-library-path.sh /etc/profile.d/ld-library-path.sh
      # CMake # CMake
      ...@@ -336,7 +337,6 @@ RUN yum install -y \ ...@@ -336,7 +337,6 @@ RUN yum install -y \
      # Additional development dependencies # Additional development dependencies
      RUN yum install -y \ RUN yum install -y \
      git \
      libepoxy-devel \ libepoxy-devel \
      && \ && \
      yum clean all && \ yum clean all && \
      ......
      centos-7/bash/gcc-8.sh → centos-7/bash/toolchain.sh
      + 5
      − 0
      View file @ e9198124
      # GCC 8
      source scl_source enable devtoolset-8 source scl_source enable devtoolset-8
      # Git 2.18
      source scl_source enable rh-git218
      \ No newline at end of file
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Please register or to comment