From b1db21e7393854a2067a4674fcb09a441c4314b1 Mon Sep 17 00:00:00 2001
From: Im-Beast <franik.mateusz@gmail.com>
Date: Mon, 14 Oct 2024 17:18:03 +0200
Subject: ci: move regression_check to full_check workflow, reuse artifact
 build

---
 .github/workflows/full_check.yaml | 35 +++++++++++++++++++++++++++--
 .github/workflows/regression.yaml | 47 ---------------------------------------
 tests/utils.ts                    |  4 ----
 3 files changed, 33 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/regression.yaml

diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml
index add89b7..fa4d9f1 100644
--- a/.github/workflows/full_check.yaml
+++ b/.github/workflows/full_check.yaml
@@ -391,7 +391,7 @@ jobs:
           key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }}
       - name: build
         run: |
-          ./build_single.sh ${{ matrix.coin }} aarch64-host-apple-darwin -j$(sysctl -n hw.logicalcpu) 
+          ./build_single.sh ${{ matrix.coin }} aarch64-host-apple-darwin -j$(sysctl -n hw.logicalcpu)
       - name: rename artifacts
         run: |
           mkdir release/gh/
@@ -448,7 +448,7 @@ jobs:
           key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }}
       - name: build
         run: |
-          ./build_single.sh ${{ matrix.coin }} host-apple-ios -j$(sysctl -n hw.logicalcpu) 
+          ./build_single.sh ${{ matrix.coin }} host-apple-ios -j$(sysctl -n hw.logicalcpu)
       - name: rename artifacts
         run: |
           mkdir release/gh/
@@ -586,6 +586,37 @@ jobs:
           cd impls/monero.ts
           deno run --unstable-ffi --allow-ffi checksum.ts
 
+  regression_check:
+    strategy:
+      matrix:
+        coin: [monero]
+    needs: [
+      lib_linux
+    ]
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 gperf gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 wget xz-utils
+
+      - uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: linux monero
+          path: release/monero
+
+      - name: Run regression tests
+        run: deno test -A tests/
+
   comment_pr:
     name: comment on pr
     runs-on: ubuntu-latest
diff --git a/.github/workflows/regression.yaml b/.github/workflows/regression.yaml
deleted file mode 100644
index b79f4ff..0000000
--- a/.github/workflows/regression.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Check if any regressions have happened
-on: [push]
-permissions:
-  issues: write
-  pull-requests: write
-jobs:
-  regression_check:
-    strategy:
-      matrix:
-        coin: [monero]
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 gperf gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 wget xz-utils
-
-      - uses: denoland/setup-deno@v2
-        with:
-          deno-version: v2.x
-
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Patch sources
-        run: |
-          git config --global --add safe.directory '*'
-          git config --global user.email "ci@mrcyjanek.net"
-          git config --global user.name "CI mrcyjanek.net"
-          ./apply_patches.sh ${{ matrix.coin }}
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.job }}-${{ matrix.coin }}
-      - name: Cache built
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ matrix.coin }}/contrib/depends/built/*
-          key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }}
-
-      - name: Run regression tests
-        run: deno test -A tests/
diff --git a/tests/utils.ts b/tests/utils.ts
index 3792fd3..78584a7 100755
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -90,10 +90,6 @@ export async function getMoneroC(version: MoneroCVersion) {
   const releaseDylibName = dylibName.slice("monero_".length);
 
   if (version === "next") {
-    // build current release
-    await $
-      .raw`bash ./build_single.sh monero ${triple} -j${navigator.hardwareConcurrency}`;
-
     await $.raw`xz -kd release/monero/${releaseDylibName}.xz`;
     await $`mkdir -p tests/libs/next`;
     await $`mv release/monero/${releaseDylibName} tests/libs/next/${endpointDylibName}`;
-- 
cgit v1.2.3