From a8d8318486faf8c90d78516027ed70d436d0bb3c Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sun, 26 May 2024 21:06:28 +0200 Subject: [PATCH] (#55) Tests: enable dependency testing for both Ubuntu variants --- .github/workflows/main.yml | 7 +++++-- github-actions.fsx | 7 +++++-- linux/Test-Dependencies.ps1 | 4 +++- ...aries.gold.txt => libraries.ubuntu-20.04.gold.txt} | 0 linux/libraries.ubuntu-22.04.gold.txt | 11 +++++++++++ 5 files changed, 24 insertions(+), 5 deletions(-) rename linux/{libraries.gold.txt => libraries.ubuntu-20.04.gold.txt} (100%) create mode 100644 linux/libraries.ubuntu-22.04.gold.txt diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f4d660b..5599132 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ on: - master schedule: - cron: 0 0 * * 1 - workflow_dispatch: + workflow_dispatch: jobs: build-ubuntu-20-04-x86-64: runs-on: ubuntu-20.04 @@ -194,7 +194,7 @@ jobs: path: build/tdlib.native.ubuntu-20.04-x64/runtimes/linux-x64/native - name: Verify library dependencies shell: pwsh - run: ./linux/Test-Dependencies.ps1 + run: ./linux/Test-Dependencies.ps1 -Platform ubuntu-20.04 - name: Set up .NET SDK uses: actions/setup-dotnet@v4 with: @@ -232,6 +232,9 @@ jobs: with: name: tdlib.native.ubuntu-22.04.x86-64 path: build/tdlib.native.linux-x64/runtimes/linux-x64/native + - name: Verify library dependencies + shell: pwsh + run: ./linux/Test-Dependencies.ps1 -Platform ubuntu-22.04 - name: Set up .NET SDK uses: actions/setup-dotnet@v4 with: diff --git a/github-actions.fsx b/github-actions.fsx index 14d9564..71f1f7a 100644 --- a/github-actions.fsx +++ b/github-actions.fsx @@ -246,7 +246,10 @@ let workflows = [ platform = Platform.Ubuntu20_04, arch = Arch.X86_64, installScript = "./linux/install.ps1 -ForTests", - testArgs = "-NuGet $env:GITHUB_WORKSPACE/tools/nuget.exe -UseMono" + testArgs = "-NuGet $env:GITHUB_WORKSPACE/tools/nuget.exe -UseMono", + afterDownloadSteps = [ + pwsh "Verify library dependencies" $"./linux/Test-Dependencies.ps1 -Platform {Platform.Ubuntu20_04}" + ] ) Workflows.TestJob( @@ -256,7 +259,7 @@ let workflows = [ installScript = "./linux/install.ps1 -ForTests", testArgs = "-NuGet $env:GITHUB_WORKSPACE/tools/nuget.exe -UseMono", afterDownloadSteps = [ - pwsh "Verify library dependencies" "./linux/Test-Dependencies.ps1" + pwsh "Verify library dependencies" $"./linux/Test-Dependencies.ps1 -Platform {Platform.Ubuntu22_04}" ] ) diff --git a/linux/Test-Dependencies.ps1 b/linux/Test-Dependencies.ps1 index 5273586..852b729 100644 --- a/linux/Test-Dependencies.ps1 +++ b/linux/Test-Dependencies.ps1 @@ -1,6 +1,8 @@ param ( + [Parameter(Mandatory = $true)] + [string] $Platform, [string] $Package = "$PSScriptRoot/../build/runtimes/linux-x64/native", - [string] $GoldFile = "$PSScriptRoot/../linux/libraries.gold.txt", + [string] $GoldFile = "$PSScriptRoot/../linux/libraries.$Platform.gold.txt", [string] $ResultFile = "$PSScriptRoot/../linux/libraries.temp.txt", [switch] $GenerateGold ) diff --git a/linux/libraries.gold.txt b/linux/libraries.ubuntu-20.04.gold.txt similarity index 100% rename from linux/libraries.gold.txt rename to linux/libraries.ubuntu-20.04.gold.txt diff --git a/linux/libraries.ubuntu-22.04.gold.txt b/linux/libraries.ubuntu-22.04.gold.txt new file mode 100644 index 0000000..db2baf9 --- /dev/null +++ b/linux/libraries.ubuntu-22.04.gold.txt @@ -0,0 +1,11 @@ +libtdjson.so + linux-vdso.so.1_1 + libssl.so.1.1 + libcrypto.so.1.1 + libz.so.1 + libstdc++.so.6 + libm.so.6 + libpthread.so.0 + libc.so.6 + /lib64/ld-linux-x86-64.so.2 + libgcc_s.so.1