https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a879e97322c771e3ff77…
commit 2a879e97322c771e3ff77ff895bae4a730514c48
Author: Maj Soklič <majs.1236(a)gmail.com>
AuthorDate: Sat Aug 12 22:24:43 2023 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Sat Aug 12 23:24:43 2023 +0300
[GITHUB] Add dllver to artifact name (#5565)
Also add missing dll version export to build-linux.
Addendum to 732f223ca0b. CORE-11288
---
.github/workflows/build.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac4aaae8bd3..3f2ee4b20ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
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
- 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}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_CCACHE=1
-DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_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}} -DCMAKE_BUILD_TYPE=${{matrix.config}}
-DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1
-DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh
. 0 ${{matrix.arch}}
- name: Build
run: echo 'cmake --build ${{github.workspace}}/build -- -k0' |
${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
- name: Generate ISOs
@@ -76,7 +76,7 @@ jobs:
- name: Upload ISOs
uses: actions/upload-artifact@v2
with:
- name:
reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
+ name:
reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
path: |
build/bootcd.iso
build/livecd.iso
@@ -141,7 +141,7 @@ jobs:
- name: Upload ISOs
uses: actions/upload-artifact@v2
with:
- name:
reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
+ name:
reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
path: |
build/bootcd.iso
build/livecd.iso
@@ -149,7 +149,7 @@ jobs:
if: ${{ matrix.config == 'Debug' }}
uses: actions/upload-artifact@v2
with:
- name:
reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
+ name:
reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
path: build/msvc_pdb
build-msvc-arm: