Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GITHUB] Improve logic to cache RosBE build

Browse source 
+ Minor implrovements:
  Use cmake args instead of forcing command working directory
  Give specific names to artifacts - bootcd/livecd
This commit is contained in:
Jérôme Gardou 2021-05-04 10:57:24 +02:00
parent f421bccbcc
commit 3644f3efca
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
.github/workflows/build.yml vendored
View file

@ -10,19 +10,22 @@ jobs:
fail-fast: false fail-fast: false
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Get Runner arch - name: Get RosBE build specifics
id: get_native_arch id: get_rosbe_spec
run: | run: |
gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}' gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}'
echo ::set-output name=march::$(gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}') echo ::set-output name=march-sha::$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}')
echo ::set-output name=git-sha::$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}')
wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899/raw/build_rosbe_ci.sh
- name: Get RosBE - name: Get RosBE
id: get_rosbe
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: RosBE-CI path: RosBE-CI
key: RosBE-CI-${{runner.os}}-${{steps.get_native_arch.outputs.march}} key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}
- name: Compile RosBE - name: Compile RosBE
if: steps.get_rosbe.outputs.cache-hit != 'true'
run: | run: |
wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899/raw/build_rosbe_ci.sh
chmod +x build_rosbe_ci.sh chmod +x build_rosbe_ci.sh
./build_rosbe_ci.sh ${{github.workspace}}/RosBE-CI ./build_rosbe_ci.sh ${{github.workspace}}/RosBE-CI
- name: Install ccache - name: Install ccache
@ -51,7 +54,9 @@ jobs:
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
echo "CCACHE_COMPILERCHECK=string:${{hashfiles('./build_rosbe_ci.sh', './RosBE-CI/git-commit')}}" >> $GITHUB_ENV - name: Ease ccache compiler check (GCC)
if: matrix.compiler == 'gcc'
run: echo "CCACHE_COMPILERCHECK=string:${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}" >> $GITHUB_ENV
- name: Configure - name: Configure
run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
- name: Build - name: Build
@ -63,12 +68,12 @@ jobs:
- name: Upload bootcd - name: Upload bootcd
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} name: reactos-bootcd-${{matrix.compiler}}-${{matrix.arch}}-${{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-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} name: reactos-livecd-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}}
path: build/livecd.iso path: build/livecd.iso
build-msvc: build-msvc:
@ -118,22 +123,18 @@ jobs:
- name: Configure - name: Configure
run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=${{matrix.compiler == 'clang-cl'}} run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=${{matrix.compiler == 'clang-cl'}}
- name: Build - name: Build
working-directory: ${{github.workspace}}\build run: cmake --build ${{github.workspace}}\build
run: cmake --build .
- name: Generate ISOs - name: Generate ISOs
working-directory: ${{github.workspace}}\build run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
run: |
cmake --build . --target bootcd
cmake --build . --target livecd
- name: Upload bootcd - name: Upload bootcd
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} name: reactos-bootcd-${{matrix.compiler}}-${{matrix.arch}}-${{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-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} name: reactos-livecd-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}}
path: build/livecd.iso path: build/livecd.iso
build-msbuild-i386: build-msbuild-i386: