Update bflat-cicd.yml

Author: MichalStrehovsky

.github/workflows/bflat-cicd.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ bflat-main, bflat-release/7.0, bflat-release/8.0 ]
+    branches: [ bflat-main, bflat-release/7.0, bflat-release/8.0, bflat-release/10.0 ]
 
   workflow_dispatch:
     inputs:
@@ -19,19 +19,19 @@ jobs:
       matrix:
         include:
           - os: linux-glibc
-            container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
+            container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64
             arch: arm64
             vm: ubuntu-latest
             crossrootfs: /crossrootfs/arm64
             rid: linux-arm64
           - os: linux-glibc
-            container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
+            container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64
             arch: x64
             vm: ubuntu-latest
             crossrootfs: /crossrootfs/x64
             rid: linux-x64
           - os: linux-bionic
-            container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64
+            container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-android-openssl-amd64
             arch: arm64
             vm: ubuntu-latest
             rid: linux-bionic-arm64
@@ -66,15 +66,15 @@ jobs:
 
       - name: Archive compiler package
         if: ${{ matrix.os == 'linux-glibc' && matrix.arch == 'x64' && github.event.inputs.version != '' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: nuget
           path: bflat/pack/bin/Release/BFlat.Compiler.${{ github.event.inputs.version }}.nupkg
 
       - name: ZIP native compiler (Linux)
         run: |
           mkdir artifacts/bflat-compiler-native
-          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*
+          cp -t artifacts/bflat-compiler-native artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libclrjit_* artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libjitinterface_*
           cp -t artifacts/bflat-compiler-native THIRD-PARTY-NOTICES.TXT artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/build/WindowsAPIs.txt
           ./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-compiler-native-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-compiler-native
         if: ${{ matrix.vm == 'ubuntu-latest' && matrix.os != 'linux-bionic' }}
@@ -83,7 +83,6 @@ jobs:
           mkdir artifacts\bflat-compiler-native
           copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\ilc\clrjit_* artifacts\bflat-compiler-native\
           copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\ilc\jitinterface_* artifacts\bflat-compiler-native\
-          copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\ilc\objwriter* artifacts\bflat-compiler-native\
           copy THIRD-PARTY-NOTICES.TXT artifacts\bflat-compiler-native\
           copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\build\WindowsAPIs.txt artifacts\bflat-compiler-native\
           pushd artifacts\bflat-compiler-native\
@@ -92,7 +91,7 @@ jobs:
         if: ${{ matrix.vm == 'windows-latest' }}
 
       - name: Archive native compiler artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: native-compiler
           path: artifacts/bflat-compiler-native-${{ matrix.os }}-${{ matrix.arch }}.zip
@@ -101,23 +100,23 @@ jobs:
       - name: ZIP libs (Linux)
         run: |
           mkdir artifacts/bflat-libs
-          cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.${{ matrix.rid }}/Release/runtimes/${{ matrix.rid }}/lib/net9.0/*
+          cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.${{ matrix.rid }}/Release/runtimes/${{ matrix.rid }}/lib/net10.0/*
           cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.${{ matrix.rid }}/Release/runtimes/${{ matrix.rid }}/native/*.Native.*a
           cp -t artifacts/bflat-libs artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/aotsdk/*
           ./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-libs
         if: ${{ matrix.vm == 'ubuntu-latest' }}
       - name: ZIP libs (Windows)
         run: |
           mkdir artifacts\bflat-libs
-          copy artifacts\bin\microsoft.netcore.app.runtime.win-${{ matrix.arch }}\Release\runtimes\win-${{ matrix.arch }}\lib\net9.0\* artifacts\bflat-libs\
+          copy artifacts\bin\microsoft.netcore.app.runtime.win-${{ matrix.arch }}\Release\runtimes\win-${{ matrix.arch }}\lib\net10.0\* artifacts\bflat-libs\
           copy artifacts\bin\coreclr\Windows.${{ matrix.arch }}.Release\aotsdk\* artifacts\bflat-libs\
           pushd artifacts\bflat-libs\
           Compress-Archive * $Env:GITHUB_WORKSPACE\artifacts\bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip
           popd
         if: ${{ matrix.vm == 'windows-latest' }}
 
       - name: Archive libs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: libs
           path: artifacts/bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip
@@ -126,12 +125,12 @@ jobs:
         if: ${{ matrix.os == 'linux-glibc' && matrix.arch == 'x64' }}
         run: |
           mkdir artifacts/bflat-refs
-          cp -t artifacts/bflat-refs artifacts/bin/microsoft.netcore.app.ref/ref/net9.0/*.dll
+          cp -t artifacts/bflat-refs artifacts/bin/microsoft.netcore.app.ref/ref/net10.0/*.dll
           ./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-refs.zip artifacts/bflat-refs
 
       - name: Archive refs
         if: ${{ matrix.os == 'linux-glibc' && matrix.arch == 'x64' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: refs
           path: artifacts/bflat-refs.zip
@@ -147,11 +146,11 @@ jobs:
         if: ${{ matrix.vm == 'windows-latest' && github.event.inputs.version == '' && matrix.arch != 'arm64' }}
 
       - name: Build tests (Linux)
-        run: ./src/tests/build.sh nativeaot release ${{ matrix.arch }} 'tree nativeaot/SmokeTests'
+        run: ./src/tests/build.sh nativeaot release ${{ matrix.arch }} 'tree nativeaot'
         if: ${{ matrix.vm == 'ubuntu-latest' && github.event.inputs.version == '' && matrix.arch != 'arm64' }}
       - name: Build tests (Windows)
         shell: cmd
-        run: src\tests\build.cmd nativeaot release ${{ matrix.arch }} tree nativeaot\SmokeTests
+        run: src\tests\build.cmd nativeaot release ${{ matrix.arch }} tree nativeaot
         if: ${{ matrix.vm == 'windows-latest' && github.event.inputs.version == '' && matrix.arch != 'arm64' }}
 
       - name: Run tests (Linux)
@@ -177,7 +176,7 @@ jobs:
           git push origin v${{ github.event.inputs.version }}
         
       - name: Download all artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: Publish compiler package
         run: ./dotnet.sh nuget push nuget/BFlat.Compiler.${{ github.event.inputs.version }}.nupkg -s https://nuget.pkg.github.com/bflattened/index.json --api-key ${{ secrets.GITHUB_TOKEN }}