Skip to content

Commit abd3568

Browse files
Update bflat-cicd.yml
1 parent e7f16f1 commit abd3568

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

.github/workflows/bflat-cicd.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
pull_request:
5-
branches: [ bflat-main, bflat-release/7.0, bflat-release/8.0 ]
5+
branches: [ bflat-main, bflat-release/7.0, bflat-release/8.0, bflat-release/10.0 ]
66

77
workflow_dispatch:
88
inputs:
@@ -74,7 +74,7 @@ jobs:
7474
- name: ZIP native compiler (Linux)
7575
run: |
7676
mkdir artifacts/bflat-compiler-native
77-
cp -t artifacts/bflat-compiler-native artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libclrjit_* artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libjitinterface_* artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libobjwriter*
77+
cp -t artifacts/bflat-compiler-native artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libclrjit_* artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libjitinterface_*
7878
cp -t artifacts/bflat-compiler-native THIRD-PARTY-NOTICES.TXT artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/build/WindowsAPIs.txt
7979
./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-compiler-native-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-compiler-native
8080
if: ${{ matrix.vm == 'ubuntu-latest' && matrix.os != 'linux-bionic' }}
@@ -83,7 +83,6 @@ jobs:
8383
mkdir artifacts\bflat-compiler-native
8484
copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\ilc\clrjit_* artifacts\bflat-compiler-native\
8585
copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\ilc\jitinterface_* artifacts\bflat-compiler-native\
86-
copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\ilc\objwriter* artifacts\bflat-compiler-native\
8786
copy THIRD-PARTY-NOTICES.TXT artifacts\bflat-compiler-native\
8887
copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\build\WindowsAPIs.txt artifacts\bflat-compiler-native\
8988
pushd artifacts\bflat-compiler-native\
@@ -101,15 +100,15 @@ jobs:
101100
- name: ZIP libs (Linux)
102101
run: |
103102
mkdir artifacts/bflat-libs
104-
cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.${{ matrix.rid }}/Release/runtimes/${{ matrix.rid }}/lib/net9.0/*
103+
cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.${{ matrix.rid }}/Release/runtimes/${{ matrix.rid }}/lib/net10.0/*
105104
cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.${{ matrix.rid }}/Release/runtimes/${{ matrix.rid }}/native/*.Native.*a
106105
cp -t artifacts/bflat-libs artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/aotsdk/*
107106
./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-libs
108107
if: ${{ matrix.vm == 'ubuntu-latest' }}
109108
- name: ZIP libs (Windows)
110109
run: |
111110
mkdir artifacts\bflat-libs
112-
copy artifacts\bin\microsoft.netcore.app.runtime.win-${{ matrix.arch }}\Release\runtimes\win-${{ matrix.arch }}\lib\net9.0\* artifacts\bflat-libs\
111+
copy artifacts\bin\microsoft.netcore.app.runtime.win-${{ matrix.arch }}\Release\runtimes\win-${{ matrix.arch }}\lib\net10.0\* artifacts\bflat-libs\
113112
copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\aotsdk\* artifacts\bflat-libs\
114113
pushd artifacts\bflat-libs\
115114
Compress-Archive * $Env:GITHUB_WORKSPACE\artifacts\bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip
@@ -126,7 +125,7 @@ jobs:
126125
if: ${{ matrix.os == 'linux-glibc' && matrix.arch == 'x64' }}
127126
run: |
128127
mkdir artifacts/bflat-refs
129-
cp -t artifacts/bflat-refs artifacts/bin/microsoft.netcore.app.ref/ref/net9.0/*.dll
128+
cp -t artifacts/bflat-refs artifacts/bin/microsoft.netcore.app.ref/ref/net10.0/*.dll
130129
./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-refs.zip artifacts/bflat-refs
131130
132131
- name: Archive refs
@@ -147,11 +146,11 @@ jobs:
147146
if: ${{ matrix.vm == 'windows-latest' && github.event.inputs.version == '' && matrix.arch != 'arm64' }}
148147

149148
- name: Build tests (Linux)
150-
run: ./src/tests/build.sh nativeaot release ${{ matrix.arch }} 'tree nativeaot/SmokeTests'
149+
run: ./src/tests/build.sh nativeaot release ${{ matrix.arch }} 'tree nativeaot'
151150
if: ${{ matrix.vm == 'ubuntu-latest' && github.event.inputs.version == '' && matrix.arch != 'arm64' }}
152151
- name: Build tests (Windows)
153152
shell: cmd
154-
run: src\tests\build.cmd nativeaot release ${{ matrix.arch }} tree nativeaot\SmokeTests
153+
run: src\tests\build.cmd nativeaot release ${{ matrix.arch }} tree nativeaot
155154
if: ${{ matrix.vm == 'windows-latest' && github.event.inputs.version == '' && matrix.arch != 'arm64' }}
156155

157156
- name: Run tests (Linux)

0 commit comments

Comments
 (0)