Fix typo for windows artifacts, fix Jenkins

Author: aleflm

.github/workflows/ci-master.yml

@@ -286,13 +286,8 @@ jobs:
       # -j$(sysctl -n hw.activecpu) fails. due to high load on macOS, and crappy github runners.
     - name: Install Required Packages
       run: |
-        if ! command -v pkg-config &> /dev/null; then
-          echo "pkg-config not found, installing..."
-          brew install pkg-config
-        else
-          echo "pkg-config is already installed"
-        fi
-        brew install automake coreutils python-setuptools cmake make
+        brew uninstall --force cmake
+        brew install --force automake coreutils python-setuptools cmake make pkg-config
       # Workaround for macOS: https://github.com/actions/runner/issues/2958
     - name: Install setuptools
       run: sudo -H pip install setuptools
@@ -337,13 +332,7 @@ jobs:
       run: sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
     - name: Install Required Packages
       run: |
-        if ! command -v pkg-config &> /dev/null; then
-          echo "pkg-config not found, installing..."
-          brew install pkg-config
-        else
-          echo "pkg-config is already installed"
-        fi
-        brew install automake coreutils python-setuptools
+        brew install --force automake coreutils python-setuptools pkg-config
       # Workaround for macOS: https://github.com/actions/runner/issues/2958
     - name: Install setuptools
       run: sudo -H pip install setuptools
@@ -557,7 +546,7 @@ jobs:
           mv *-win64-debug.zip x86_64-win64-guix-debug-symbols.zip || true  
           mv *-win64-setup-unsigned.exe x86_64-win64-guix-installer-unsigned.exe || true
           mv *-win64.zip x86_64-win64-guix-release-binaries.zip || true
-          mv SHA256SUMS.part x86_64-win64-guix-checksums-sha256 || true
+          mv SHA256SUMS.part x86_64-wind64-guix-checksums-sha256 || true
       - name: Upload Windows Release Binaries
         uses: actions/upload-artifact@v4
         with:

Jenkinsfile

@@ -7,49 +7,75 @@ pipeline {
     }
     environment {
         CCACHE_DIR = '/tmp/.ccache'
+        HOST = 'x86_64-linux-gnu'
     }
     stages {
         stage('Build dependencies') {
             steps {
                 sh 'git clean -d -f -f -q -x'
                 dir('depends') {
-                    sh 'make -j`nproc` HOST=x86_64-linux-gnu'
+                    sh 'make -j`nproc` HOST=${HOST}'
                 }
             }
         }
         stage('Build') {
             steps {
-                sh './autogen.sh'
-                sh './configure --prefix=`pwd`/depends/x86_64-linux-gnu'
-                sh 'make dist'
-                sh 'mkdir -p dist'
-                sh 'tar -C dist --strip-components=1 -xzf firo-*.tar.gz'
-                dir('dist') {
-                    sh './configure --prefix=`pwd`/../depends/x86_64-linux-gnu --enable-tests --enable-crash-hooks'
+                sh '''
+                    export HOST_TRIPLET=${HOST}
+                    env PKG_CONFIG_PATH="$(pwd)/depends/$HOST_TRIPLET/lib/pkgconfig:$PKG_CONFIG_PATH" \\
+                    cmake -DCMAKE_TOOLCHAIN_FILE=$(pwd)/depends/$HOST_TRIPLET/toolchain.cmake \\
+                    -DBUILD_CLI=ON -DBUILD_TESTS=ON -DBUILD_GUI=ON -DCMAKE_BUILD_TYPE=Release \\
+                    -DCLIENT_VERSION_IS_RELEASE=true -DENABLE_CRASH_HOOKS=ON \\
+                    -S$(pwd) -B$(pwd)/build
+                '''
+                dir('build') {
                     sh 'make -j`nproc`'
                 }
             }
         }
         stage('Test') {
             steps {
                 catchError(buildResult: 'FAILURE', stageResult: 'FAILURE'){
-                    dir('dist') {
-                        sh 'make check'
+                    dir('build') {
+                        sh 'make test'
                     }
                 }
             }
         }
         stage('Archive unit tests logs') {
             steps {
-                archiveArtifacts artifacts: 'dist/src/test-suite.log',
-                allowEmptyArchive: true
+                script {
+                    sh '''
+                        mkdir -p test-logs
+                        find build -name "LastTest.log" -exec cp {} test-logs/ctest-last.log \\; || true
+                        find build -name "LastTestsFailed.log" -exec cp {} test-logs/ctest-failed.log \\; || true
+                        find build -path "*/Testing/Temporary/*" -name "*.log" -exec cp {} test-logs/ \\; || true
+                        find build -name "*test*.log" -exec cp {} test-logs/ \\; || true
+                    '''
                 }
+                archiveArtifacts artifacts: 'test-logs/**',
+                allowEmptyArchive: true
+            }
         }
         stage('RPC Tests') {
             steps {
-                dir('dist') {
-                    sh 'qa/pull-tester/rpc-tests.py -extended'
+                sh '''
+                    export FIROD="$(pwd)/build/bin/firod"
+                    export FIROCLI="$(pwd)/build/bin/firo-cli"
+                    qa/pull-tester/rpc-tests.py -extended
+                '''
+            }
+        }
+        stage('Archive Binaries') {
+            steps {
+                script {
+                    sh '''
+                        mkdir -p artifacts
+                        cp build/bin/firo* artifacts/ || true
+                    '''
                 }
+                archiveArtifacts artifacts: 'artifacts/**',
+                allowEmptyArchive: true
             }
         }
     }