[GITHUB] Update LLVM version to 12 and fix indentation

This commit is contained in:
Victor Perevertkin 2021-04-22 13:48:43 +03:00
parent 32428a39ed
commit 246dbd3384
No known key found for this signature in database
GPG key ID: C750B7222E9C7830

View file

@ -6,102 +6,102 @@ jobs:
name: GCC (i386) name: GCC (i386)
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Install RosBE - name: Install RosBE
run: | run: |
wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst
mkdir ${{github.workspace}}/rosbe mkdir ${{github.workspace}}/rosbe
tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe
- name: Install other packages - name: Install other packages
run: sudo apt install ccache run: sudo apt install ccache
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
path: src path: src
- name: Set up cache for ccache - name: Set up cache for ccache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ccache path: ccache
key: ccache-gcc-i386-${{github.sha}} key: ccache-gcc-i386-${{github.sha}}
restore-keys: | restore-keys: |
ccache-gcc-i386- ccache-gcc-i386-
- name: Set ccache settings - name: Set ccache settings
run: | run: |
echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV
echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV
echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV
- name: Configure - name: Configure
run: | run: |
mkdir build mkdir build
echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands
${{github.workspace}}/rosbe/RosBE.sh < commands ${{github.workspace}}/rosbe/RosBE.sh < commands
- name: Build - name: Build
run: | run: |
echo 'cd ${{github.workspace}}/build && cmake --build .' > commands echo 'cd ${{github.workspace}}/build && cmake --build .' > commands
${{github.workspace}}/rosbe/RosBE.sh < commands ${{github.workspace}}/rosbe/RosBE.sh < commands
- name: Generate ISOs - name: Generate ISOs
run: | run: |
echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands
${{github.workspace}}/rosbe/RosBE.sh < 'commands' ${{github.workspace}}/rosbe/RosBE.sh < 'commands'
- name: Print ccache statistics - name: Print ccache statistics
run: ccache -s run: ccache -s
- name: Upload bootcd - name: Upload bootcd
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: reactos-gcc-i386-${{github.sha}} name: reactos-gcc-i386-${{github.sha}}
path: build/bootcd.iso path: build/bootcd.iso
- name: Upload livecd - name: Upload livecd
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: reactos-gcc-i386-${{github.sha}} name: reactos-gcc-i386-${{github.sha}}
path: build/livecd.iso path: build/livecd.iso
build-clang-i386: build-clang-i386:
name: Clang (i386) name: Clang (i386)
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Install RosBE - name: Install RosBE
run: | run: |
wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst
mkdir ${{github.workspace}}/rosbe mkdir ${{github.workspace}}/rosbe
tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe
- name: Set LLVM version - name: Set LLVM version
run: | run: |
echo "LLVM_VERSION=11" >> $GITHUB_ENV echo "LLVM_VERSION=12" >> $GITHUB_ENV
- name: Install LLVM - name: Install LLVM
run: | run: |
wget https://apt.llvm.org/llvm.sh wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh chmod +x llvm.sh
sudo ./llvm.sh $LLVM_VERSION sudo ./llvm.sh $LLVM_VERSION
- name: Install other packages - name: Install other packages
run: | run: |
sudo apt install ccache sudo apt install ccache
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
path: src path: src
- name: Set up cache for ccache - name: Set up cache for ccache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ccache path: ccache
key: ccache-clang-i386-${{github.sha}} key: ccache-clang-i386-${{github.sha}}
restore-keys: | restore-keys: |
ccache-clang-i386- ccache-clang-i386-
- name: Set ccache settings - name: Set ccache settings
run: | run: |
echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV
echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV
echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV
- name: Configure - name: Configure
run: | run: |
mkdir build mkdir build
echo 'cd ${{github.workspace}}/build && cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=i386 -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' > commands echo 'cd ${{github.workspace}}/build && cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=i386 -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' > commands
${{github.workspace}}/rosbe/RosBE.sh < commands ${{github.workspace}}/rosbe/RosBE.sh < commands
- name: Build - name: Build
run: | run: |
echo 'cd ${{github.workspace}}/build && cmake --build .' > commands echo 'cd ${{github.workspace}}/build && cmake --build .' > commands
${{github.workspace}}/rosbe/RosBE.sh < commands ${{github.workspace}}/rosbe/RosBE.sh < commands
- name: Print ccache statistics - name: Print ccache statistics
run: ccache -s run: ccache -s
build-clang-cl-i386: build-clang-cl-i386:
name: Clang-CL (i386) name: Clang-CL (i386)