From 05519e5738047b7e66f2f90010f2c4f36b41498b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 26 Nov 2024 13:27:07 -0500 Subject: [PATCH 1/4] ci: Adjust CodeQL --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 773d19c56005..fb2f53cf92ad 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,7 +44,7 @@ jobs: matrix: include: - language: csharp - build-mode: none + build-mode: autobuild - language: java-kotlin build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. - language: javascript-typescript From 6e440c0c1ae189e6bd74872be4c0700a150cab57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Nov 2024 08:57:43 -0500 Subject: [PATCH 2/4] chore: Use manual build --- .github/workflows/codeql.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fb2f53cf92ad..179abc4f423f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,7 +44,7 @@ jobs: matrix: include: - language: csharp - build-mode: autobuild + build-mode: manual - language: java-kotlin build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. - language: javascript-typescript @@ -101,12 +101,8 @@ jobs: - if: matrix.build-mode == 'manual' shell: bash run: | - echo 'If you are using a "manual" build mode for one or more of the' \ - 'languages you are analyzing, replace this with the commands to build' \ - 'your code, for example:' - echo ' make bootstrap' - echo ' make release' - exit 1 + cd src/SamplesApp/SamplesApp.Skia.Generic + dotnet build SamplesApp.Skia.Generic.csproj -f net9.0 -c Release -p:UnoTargetFrameworkOverride=net9.0 /bl:ios-netcoremobile-sampleapp.binlog - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 From 560ee0eecd06c6614ce0c0a410d7fb4262918abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Nov 2024 09:54:52 -0500 Subject: [PATCH 3/4] chore: Install .NET 9 --- .github/workflows/codeql.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 179abc4f423f..30247aaf3c30 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -61,7 +61,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Free Disk Space (Ubuntu) if: runner.os == 'Linux' uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be #v1.3.1 @@ -73,12 +72,24 @@ jobs: # all of these default to true, but feel free to set to # "false" if necessary for your workflow android: true - dotnet: false + dotnet: true haskell: true large-packages: true docker-images: true swap-storage: true + - name: Pin .NET Version + run: | + cp build/ci/net9/global.json global.json + + - name: Setup .NET SDK + uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3 + with: + global-json-file: global.json + env: + DOTNET_INSTALL_DIR: ${{ runner.temp }}\dotnet + DOTNET_ROOT: ${{ runner.temp }}\dotnet + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 From ea5fe3d433d4e6e987f7e2b7897b9a8c1605a0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Nov 2024 10:02:58 -0500 Subject: [PATCH 4/4] chore: Adjust dotnet path --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 30247aaf3c30..7144510086ce 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -87,8 +87,8 @@ jobs: with: global-json-file: global.json env: - DOTNET_INSTALL_DIR: ${{ runner.temp }}\dotnet - DOTNET_ROOT: ${{ runner.temp }}\dotnet + DOTNET_INSTALL_DIR: ${{ runner.temp }}/.dotnet + DOTNET_ROOT: ${{ runner.temp }}/.dotnet # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL