From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 9CDF2937F1C; Sat, 17 Feb 2024 01:24:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9CDF2937F1C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1708122272; bh=ZrY2GHDnSHZd+A40EY7rzYhSmZE0Z7WJ5xV7iSNzSAM=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rnmyhkwEwfiaSybLjuGatUozsJTt3aJ/wUMzAPmf41oFb6sTHU8DZuegDI8jNd2PE jnHB/IKdOmiOoJbZPiQKDuc928Sjsa5bt2NzgvBykWkDYcpEKbBtr83gYxhjefuMAD +0G1GXe4mESHoVO7UUIAlmjqYCr+r9dD1NckOvGc= Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 662BD57A521 for ; Sat, 17 Feb 2024 01:24:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 662BD57A521 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-51296b58239so1362883e87.1 for ; Fri, 16 Feb 2024 14:24:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708122270; x=1708727070; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WpcBL8Aq5tiwsMj2eepJVJj0e4DKexSIaP6Xl1h1V8k=; b=GILCteOKb+fzXb3TyRolO/0GjIi+ameTitY9Eeyrm448UVX/9YiIZOSP7MgEq3UeS+ CQy8mnr8Fwrqb8Lew3MVPJqGxOmQGfvaZLabDhf7X1FqWE7XfZFUVtU/xaZ3UWXxicws KOKKhTfABocYBdG7m4lgjDWMbzG6K2m6c5zNap14YfPnyJl6vSLf9FcV2PPmcH7hs8Ju HwfnXHmGlXOqqTABxaUJJT6+JellWAHBdR6zA9RT6jQbMTw2wdk4D1eKyG2LREMhPu3d CiLmMZdZlFUkPrBFqJHWQFSjq/buYFDZRd9tdmnt4AI3T6vuAFcgfphrZAjDuHAACcNQ DDRg== X-Gm-Message-State: AOJu0YyftKQwhtEsLBYmbwrqJBDd2dsszhuw1EyPH5u2Zt721M1ajYWQ bj07UuNWLgIwZuEjXpcFYtBvM1M4r+VtD4ncC1V76ScaDBH8HejUvDth8vfru/uj3A== X-Google-Smtp-Source: AGHT+IEs6/La3QgNwvFWl4Orixm6eN0oBJfPl5lMfxWkL1gDCKo56B1xEmV+Vzs4XNW5jqSwg9pNVA== X-Received: by 2002:a05:6512:3698:b0:511:ab58:da2f with SMTP id d24-20020a056512369800b00511ab58da2fmr3798121lfs.30.1708122270007; Fri, 16 Feb 2024 14:24:30 -0800 (PST) Received: from localhost.localdomain (95-24-0-113.broadband.corbina.ru. [95.24.0.113]) by smtp.gmail.com with ESMTPSA id f15-20020a19380f000000b00511ad0840e6sm93542lfa.101.2024.02.16.14.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 14:24:29 -0800 (PST) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Date: Sat, 17 Feb 2024 01:24:20 +0300 Message-ID: <20240216222420.179993-1-m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit] ci: extend tarantool integration testing X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch makes use of reusable workflows from the Tarantool repository, so now LuaJIT CI tests integration in all relevant workflows. Also, this patch disables MacOS testing for Tarantool integration since those runs were made nightly in the Tarantool repo. --- Branch: https://github.com/tarantool/luajit/tree/fckxorg/integration-testing .github/workflows/exotic-builds-testing.yml | 34 +++++ .github/workflows/tarantool-integration.yml | 35 ++++++ .github/workflows/testing.yml | 130 +++++++++++++++----- 3 files changed, 169 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/tarantool-integration.yml diff --git a/.github/workflows/exotic-builds-testing.yml b/.github/workflows/exotic-builds-testing.yml index a9ba5fd5..46a3c1ef 100644 --- a/.github/workflows/exotic-builds-testing.yml +++ b/.github/workflows/exotic-builds-testing.yml @@ -82,3 +82,37 @@ jobs: - name: test run: cmake --build . --parallel --target LuaJIT-test working-directory: ${{ env.BUILDDIR }} + + test-exotic-tarantool: + strategy: + fail-fast: false + matrix: + ARCH: [ARM64, x86_64] + BUILDTYPE: [Debug, Release] + GC64: [ON, OFF] + OS: [Linux, macOS] + include: + - BUILDTYPE: Debug + CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug + - BUILDTYPE: Release + CMAKEFLAGS: -DCMAKE_BUILD_TYPE=RelWithDebInfo + exclude: + - ARCH: ARM64 + GC64: OFF + - OS: macOS + GC64: OFF + name: > + Tarantool + (${{ matrix.OS }}/${{ matrix.ARCH }}) + ${{ matrix.BUILDTYPE }} + GC64:${{ matrix.GC64 }} + needs: test-exotic + uses: tarantool/tarantool/.github/workflows/luajit-integration.yml@master + with: + CMAKE_EXTRA_PARAMS: > + -G Ninja + ${{ matrix.CMAKEFLAGS }} + -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }} + arch: ${{ matrix.ARCH }} + os: ${{ matrix.OS }} + revision: ${{ github.sha }} diff --git a/.github/workflows/tarantool-integration.yml b/.github/workflows/tarantool-integration.yml new file mode 100644 index 00000000..81abfb94 --- /dev/null +++ b/.github/workflows/tarantool-integration.yml @@ -0,0 +1,35 @@ +name: Tarantool integration testing + +on: + push: + branches-ignore: + - '**-notest' + - 'upstream-**' + tags-ignore: + - '**' + +concurrency: + # An update of a developer branch cancels the previously + # scheduled workflow run for this branch. However, the default + # branch, and long-term branch (tarantool/release/2.11, + # tarantool/release/2.10, etc) workflow runs are never canceled. + # + # We use a trick here: define the concurrency group as 'workflow + # run ID' + # 'workflow run attempt' because it is a unique + # combination for any run. So it effectively discards grouping. + # + # XXX: we cannot use `github.sha` as a unique identifier because + # pushing a tag may cancel a run that works on a branch push + # event. + group: ${{ startsWith(github.ref, 'refs/heads/tarantool/') + && format('{0}-{1}', github.run_id, github.run_attempt) + || format('{0}-{1}', github.workflow, github.ref) }} + cancel-in-progress: true + +jobs: + test-tarantool-integration: + uses: tarantool/tarantool/.github/workflows/integration.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index cb4ba57b..f9e38bf1 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -83,37 +83,107 @@ jobs: run: cmake --build . --parallel --target LuaJIT-test working-directory: ${{ env.BUILDDIR }} + test-tarantool-coverage: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/coverage.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} - test-tarantool: - strategy: - fail-fast: false - matrix: - ARCH: [ARM64, x86_64] - BUILDTYPE: [Debug, Release] - GC64: [ON, OFF] - OS: [Linux, macOS] - include: - - BUILDTYPE: Debug - CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug - - BUILDTYPE: Release - CMAKEFLAGS: -DCMAKE_BUILD_TYPE=RelWithDebInfo - exclude: - - ARCH: ARM64 - GC64: OFF - - OS: macOS - GC64: OFF - name: > - Tarantool - (${{ matrix.OS }}/${{ matrix.ARCH }}) - ${{ matrix.BUILDTYPE }} - GC64:${{ matrix.GC64 }} + test-tarantool-debug: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/debug.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-debug_aarch64: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/debug_aarch64.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-debug_asan_clang: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/debug_asan_clang.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-default_gcc_centos_7: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/default_gcc_centos_7.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-memtx_allocator_based_on_malloc: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/memtx_allocator_based_on_malloc.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-out_of_source: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/out_of_source.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-perf_micro: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/perf_micro.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-release: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/release.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-release_asan_clang: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/release_asan_clang.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-release_clang: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/release_clang.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-release_lto: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/release_lto.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-release_lto_clang: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/release_lto_clang.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-static_build: + needs: test-luajit + uses: tarantool/tarantool/.github/workflows/static_build.yml@master + with: + submodule: luajit + revision: ${{ github.sha }} + + test-tarantool-static_build_cmake_linux: needs: test-luajit - uses: tarantool/tarantool/.github/workflows/luajit-integration.yml@master + uses: tarantool/tarantool/.github/workflows/static_build_cmake_linux.yml@master with: - CMAKE_EXTRA_PARAMS: > - -G Ninja - ${{ matrix.CMAKEFLAGS }} - -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }} - arch: ${{ matrix.ARCH }} - os: ${{ matrix.OS }} + submodule: luajit revision: ${{ github.sha }} -- 2.43.0