runnable_cxx.yml (dmd-2.094.0) | : | runnable_cxx.yml (dmd-2.094.1) | ||
---|---|---|---|---|
skipping to change at line 209 | skipping to change at line 209 | |||
${SCRIPT_FULL_PATH}/clang++ -isystem /Library/Developer/CommandLineTools /SDKs/MacOSX.sdk/usr/include/ $@ | ${SCRIPT_FULL_PATH}/clang++ -isystem /Library/Developer/CommandLineTools /SDKs/MacOSX.sdk/usr/include/ $@ | |||
EOF | EOF | |||
chmod +x ${TMP_CC}-wrapper ${TMP_CC}++-wrapper | chmod +x ${TMP_CC}-wrapper ${TMP_CC}++-wrapper | |||
fi | fi | |||
- name: '[Posix] Setup environment variables' | - name: '[Posix] Setup environment variables' | |||
if: matrix.compiler == 'clang' && runner.os != 'Windows' | if: matrix.compiler == 'clang' && runner.os != 'Windows' | |||
run: | | run: | | |||
TMP_CC='${{ github.workspace }}/clang+llvm-${{ matrix.cxx-version }}-${{ matrix.arch }}/bin/clang' | TMP_CC='${{ github.workspace }}/clang+llvm-${{ matrix.cxx-version }}-${{ matrix.arch }}/bin/clang' | |||
if [ "${{ matrix.os }}" == "macOS-10.15" ]; then | if [ "${{ matrix.os }}" == "macOS-10.15" ]; then | |||
echo ::set-env name=CC::${TMP_CC}-wrapper | echo "CC=${TMP_CC}-wrapper" >> $GITHUB_ENV | |||
echo ::set-env name=CXX::${TMP_CC}++-wrapper | echo "CXX=${TMP_CC}++-wrapper" >> $GITHUB_ENV | |||
else | else | |||
echo ::set-env name=CC::${TMP_CC} | echo "CC=${TMP_CC}" >> $GITHUB_ENV | |||
echo ::set-env name=CXX::${TMP_CC}++ | echo "CXX=${TMP_CC}++" >> $GITHUB_ENV | |||
fi | fi | |||
# On OSX and Linux, clang is installed by default and in the path, | # On OSX and Linux, clang is installed by default and in the path, | |||
# so make sure ${CC} works | # so make sure ${CC} works | |||
- name: '[Posix] Verifying installed clang version' | - name: '[Posix] Verifying installed clang version' | |||
if: matrix.compiler == 'clang' && runner.os != 'Windows' | if: matrix.compiler == 'clang' && runner.os != 'Windows' | |||
run: | | run: | | |||
set -e | set -e | |||
if ${CXX} --version | grep -q 'version ${{ matrix.cxx-version }}'; then | if ${CXX} --version | grep -q 'version ${{ matrix.cxx-version }}'; then | |||
${CXX} --version | ${CXX} --version | |||
skipping to change at line 243 | skipping to change at line 243 | |||
run: | | run: | | |||
# Workaround bug in Github actions | # Workaround bug in Github actions | |||
curl https://cli-assets.heroku.com/apt/release.key | sudo apt-key add - | curl https://cli-assets.heroku.com/apt/release.key | sudo apt-key add - | |||
# Make sure we have the essentials | # Make sure we have the essentials | |||
sudo apt-get update | sudo apt-get update | |||
sudo apt-get install build-essential software-properties-common -y | sudo apt-get install build-essential software-properties-common -y | |||
# This ppa provides multiple versions of g++ | # This ppa provides multiple versions of g++ | |||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | |||
sudo apt-get update | sudo apt-get update | |||
sudo apt-get install ${{ matrix.target }} ${{ matrix.target }}-multilib | sudo apt-get install ${{ matrix.target }} ${{ matrix.target }}-multilib | |||
echo ::set-env name=CC::${{ matrix.target }} | echo "CC=${{ matrix.target }}" >> $GITHUB_ENV | |||
echo ::set-env name=CXX::${{ matrix.target }} | echo "CXX=${{ matrix.target }}" >> $GITHUB_ENV | |||
# Make sure ${CC} works and we don't use the $PATH one | # Make sure ${CC} works and we don't use the $PATH one | |||
- name: '[Linux] Verifying installed g++ version' | - name: '[Linux] Verifying installed g++ version' | |||
if: matrix.compiler == 'g++' | if: matrix.compiler == 'g++' | |||
run: | | run: | | |||
set -e | set -e | |||
if ${CXX} --version | grep -q '${{ matrix.target }} (Ubuntu '; then | if ${CXX} --version | grep -q '${{ matrix.target }} (Ubuntu '; then | |||
${CXX} --version | ${CXX} --version | |||
else | else | |||
echo "Expected version ${{ matrix.target }}, from '${CXX}', got:" | echo "Expected version ${{ matrix.target }}, from '${CXX}', got:" | |||
End of changes. 3 change blocks. | ||||
6 lines changed or deleted | 6 lines changed or added |