Skip to content

Commit

Permalink
Merge branch 'master' into cleanup-2020-09-21
Browse files Browse the repository at this point in the history
  • Loading branch information
aloysbaillet authored Sep 24, 2020
2 parents aa9f78a + 8b1f49f commit 055247b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (c) Contributors to the aswf-docker Project. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

# Avoid Windows line breaks in shell scripts (bound to fail)
*.sh text eol=lf
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The `latest` tag is pointing to the current VFX Platorm year images, e.g. `aswf/

There is another dockerhub organisation with copies of the `aswf` docker images called `aswftesting`, images published there are for general testing and experimentations. Images can be pushed by any fork of the official repo as long as the branch is called `testing`. Images in this org will change without notice and could be broken in many unexpected ways!

To get write access to the `aswftesting` dockerhub organisation you can open a jira issue [there](jira.aswf.io).
To get write access to the `aswftesting` dockerhub organisation you can open a jira issue [there](https://jira.aswf.io).

### Status
As of June 2020 there are full 2018, 2019 and 2020 [VFX Platform](https://vfxplatform.com) compliant images. And a preview of 2021
Expand Down
2 changes: 1 addition & 1 deletion scripts/common/build_clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cd "llvm-project-llvmorg-${CLANG_VERSION}/llvm"

mkdir build
cd build
cmake -DLLVM_ENABLE_PROJECTS="clang;libcxx;libcxxabi;compiler-rt;lld" \
cmake -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libcxx;libcxxabi;compiler-rt;lld" \
-DCMAKE_BUILD_TYPE=Release \
-G "Unix Makefiles" \
-DGCC_INSTALL_PREFIX="/opt/rh/devtoolset-${DTS_VERSION}/root/usr" \
Expand Down
6 changes: 6 additions & 0 deletions scripts/tests/1/test_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ then
exit 1
fi

clang_tidy_v=$(clang-tidy --version)
if [[ $clang_tidy_v != *LLVM\ version\ 7.0* ]]
then
exit 1
fi

gcc_v=$(gcc --version)
if [[ $gcc_v != gcc\ \(GCC\)\ 6.3* ]]
then
Expand Down
6 changes: 6 additions & 0 deletions scripts/tests/2/test_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ then
exit 1
fi

clang_tidy_v=$(clang-tidy --version)
if [[ $clang_tidy_v != *LLVM\ version\ 10.0* ]]
then
exit 1
fi

gcc_v=$(gcc --version)
if [[ $gcc_v != gcc\ \(GCC\)\ 9.3* ]]
then
Expand Down

0 comments on commit 055247b

Please sign in to comment.