Skip to content

Commit

Permalink
Merge branch 'master' into feature/854_metadatastorage_is_not_movable
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitry Malysh authored Jul 31, 2023
2 parents 180cad5 + 711337d commit 4df3a6b
Show file tree
Hide file tree
Showing 4,352 changed files with 2,469,651 additions and 267,632 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .ci/docker/buildpack-arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ RUN apt update && \
ENV CC=aarch64-linux-gnu-gcc-5
ENV CXX=aarch64-linux-gnu-g++-5
ENV INDIGO_QEMU_BINARY=qemu-aarch64-static
ENV ASAN_OPTIONS=alloc_dealloc_mismatch=0
RUN echo $'leak:libfontconfig\nleak:libc\n' >> /opt/external.supp
ENV LSAN_OPTIONS=suppressions=/opt/external.supp

RUN cmake --version && \
aarch64-linux-gnu-gcc-5 --version && \
Expand Down
9 changes: 7 additions & 2 deletions .ci/docker/buildpack-centos7/Dockerfile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,21 @@ ARG GIT_VERSION=227
RUN yum install -y epel-release centos-release-scl
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
RUN yum update -y
RUN yum install -y devtoolset-${DEVTOOLSET_VERSION}-gcc-c++ freetype-devel fontconfig-devel make python3 rh-git${GIT_VERSION}
RUN yum install -y devtoolset-${DEVTOOLSET_VERSION}-gcc-c++ devtoolset-${DEVTOOLSET_VERSION}-libasan-devel devtoolset-${DEVTOOLSET_VERSION}-liblsan-devel freetype-devel fontconfig-devel make python3 rh-git${GIT_VERSION}
RUN yum clean -y all
RUN echo $'leak:libfontconfig\nleak:libc\n' >> /opt/external.supp

# Enable the SCL for all bash scripts.
ENV MANPATH=/opt/rh/rh-git${GIT_VERSION}/root/usr/share/man:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/share/man \
X_SCLS="devtoolset-${DEVTOOLSET_VERSION} rh-git${GIT_VERSION}" \
PCP_DIR=/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root \
PATH=/opt/rh/rh-git${GIT_VERSION}/root/usr/bin:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
PKG_CONFIG_PATH=/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64/pkgconfig \
LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64/dyninst:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib/dyninst:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib
LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64/dyninst:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib/dyninst:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${DEVTOOLSET_VERSION}/root/usr/lib \
LSAN_OPTIONS=suppressions=/opt/external.supp \
ASAN_OPTIONS=alloc_dealloc_mismatch=0


RUN PIP_ONLY_BINARY="cmake" python3 -m pip install cmake

RUN cmake --version && \
Expand Down
4 changes: 2 additions & 2 deletions .ci/docker/indigo-tester/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM debian:stable-slim

ARG JDK_VERSION_MAJOR=8u342
ARG JDK_VERSION_MINOR=b07
ARG MAVEN_VERSION=3.8.6
ARG MAVEN_VERSION=3.8.8
ARG JYTHON_VERSION=2.7.2
ARG DOTNET_VERSION=6.0
ARG IRONPYTHON_VERSION=3.4.0-beta1
ARG IRONPYTHON_VERSION=3.4.0

RUN set -eux && \
apt update && \
Expand Down
14 changes: 7 additions & 7 deletions .ci/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
set -eux

if [ "${1:-}" == "" ]; then
echo "Usage: ${0} MAJOR.MINOR.PATCH [suffix] [<revision_number>]"
echo "Usage: ${0} MAJOR.MINOR.PATCH[.BUILD] [suffix] [<revision_number>]"
exit 1
fi

root=$(realpath "$(dirname ${0})/..")

if [ "$(git branch --show-current)" != "master" ]; then
echo "Version update should be done only on master!"
if [[ $(git branch --show-current) != release* && $(git branch --show-current) != master ]]; then
echo "Version update should be done only on master or release/* branches!"
exit 2
fi
fi


old_base_version=$(sed -n 1p ${root}/.ci/version.txt)
Expand Down Expand Up @@ -41,8 +41,8 @@ else
fi


if ! [[ ${1} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "First argument (version) should be in MAJOR.MINOR.PATCH format!"
if ! [[ ${1} =~ ^[0-9]+\.[0-9]+\.[0-9]+[\.0-9]*$ ]]; then
echo "First argument (version) should be in MAJOR.MINOR.PATCH[.BUILD] format!"
exit 4
fi
if [[ "${2:-}" != "" ]] && ! [[ ${2} =~ ^[a-z]+$ ]]; then
Expand Down Expand Up @@ -110,4 +110,4 @@ sed -i "s/${old_version}/${new_version}/g" ${root}/api/r/DESCRIPTION

# JS
sed -i "s/${old_version}/${new_version}/g" ${root}/api/wasm/indigo-ketcher/package.json
sed -i "s/${old_version}/${new_version}/g" ${root}/utils/indigo-service-client/package.json
sed -i "s/${old_version}/${new_version}/g" ${root}/utils/indigo-service/frontend/ui/package.json
6 changes: 3 additions & 3 deletions .ci/version.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1.8.0
1.14.0
dev
1


3dae155f68d98726442a58472b00c7f6d13d06e001e1fa60ba28a4ca7b7c185c
a58ce37117230ed78c9586f2f589284ad81d23dd386e145a4370dc62863f258b
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ labels: Enhancement

---

**Is your feature request related to a problem? Please describe.**
**Background**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
**Solution**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
**Alternatives**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/docker-images.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Indigo Docker images preparation

on:
push:
branches:
- master
workflow_dispatch:

jobs:
Expand Down
Loading

0 comments on commit 4df3a6b

Please sign in to comment.