From e109b46a38ddbcd1c44d91e194e4fb118489fae5 Mon Sep 17 00:00:00 2001 From: delarea Date: Wed, 1 Jan 2025 15:42:35 +0200 Subject: [PATCH 1/3] Update .NET and patch installation issues with ubuntu specific step --- .github/workflows/integrationTests.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index 495b5497f..02ee8d7b3 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -330,10 +330,26 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} + # Prepare ubuntu by installing Mono and handle dotnet installation issues. + - name: Prepare ubuntu + if: matrix.os == 'ubuntu' + run: | + # Install Mono + sudo apt-get update + sudo apt-get install -y apt-transport-https dirmngr gnupg ca-certificates + sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF + echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list + sudo apt-get update + sudo apt-get install -y mono-complete + # Fixes dotnet installation issues, see https://github.com/jfrog/jfrog-cli/pull/2808 for more details. + echo "DOTNET_INSTALL_DIR=/usr/share/dotnet" >> $GITHUB_ENV + sudo mkdir -p /usr/share/dotnet + sudo chmod 777 /usr/share/dotnet + - name: Install dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: "3.x" + dotnet-version: "6.x" - name: Install NuGet uses: nuget/setup-nuget@v2 From 6cf69ff8cce5e5b009c827a2e6543753a57ba66e Mon Sep 17 00:00:00 2001 From: delarea Date: Wed, 1 Jan 2025 15:44:50 +0200 Subject: [PATCH 2/3] fix if --- .github/workflows/integrationTests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index 02ee8d7b3..7cfd0d4a9 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -332,7 +332,7 @@ jobs: # Prepare ubuntu by installing Mono and handle dotnet installation issues. - name: Prepare ubuntu - if: matrix.os == 'ubuntu' + if: matrix.os == 'ubuntu-latest' run: | # Install Mono sudo apt-get update From 20ba6080c52ef873188e99b807c4bfdf5a1f1ad9 Mon Sep 17 00:00:00 2001 From: delarea Date: Wed, 1 Jan 2025 16:09:21 +0200 Subject: [PATCH 3/3] update secret