From e747c50bd00fa13e956b0e8fe766a31694511ef2 Mon Sep 17 00:00:00 2001 From: firstcryptoman Date: Tue, 16 Jul 2024 00:04:46 +0400 Subject: [PATCH 1/4] some changes in the linux build part --- .github/workflows/ci-master.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index 659e995015..a4ebb9c2bc 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -22,7 +22,7 @@ jobs: ARTIFACT_DIR: source steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Required Packages run: | sudo apt-get update @@ -41,7 +41,7 @@ jobs: mkdir -p $ARTIFACT_DIR mv depends.tar.gz firo-*.tar.gz $ARTIFACT_DIR - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ env.SOURCE_ARTIFACT }} path: ${{ env.ARTIFACT_DIR }} @@ -54,9 +54,16 @@ jobs: TEST_LOG_ARTIFACT_DIR: test-logs steps: - name: Getting Source - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: - name: ${{ env.SOURCE_ARTIFACT }} + pattern: source-* + merge-multiple: false + run-id: ${{ github.run_id }} + + - name: List downloaded files and directories + run: ls -la + working-directory: ${{ github.workspace }} + - name: Extract Archives run: | tar -xzf depends.tar.gz @@ -87,7 +94,7 @@ jobs: mkdir -p $ARTIFACT_DIR mv $SOURCE_ARTIFACT/src/{firo-cli,firo-tx,firod,qt/firo-qt} $ARTIFACT_DIR - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: linux-binaries path: ${{ env.ARTIFACT_DIR }} @@ -108,7 +115,7 @@ jobs: fi - name: Upload Test Logs Artifact if: failure() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: test-logs path: ${{ env.TEST_LOG_ARTIFACT_DIR }} @@ -120,7 +127,7 @@ jobs: ARTIFACT_DIR: windows-binaries steps: - name: Getting Source - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: ${{ env.SOURCE_ARTIFACT }} - name: Extract Archives @@ -149,7 +156,7 @@ jobs: mkdir -p $ARTIFACT_DIR mv $SOURCE_ARTIFACT/src/{firo-cli.exe,firo-tx.exe,firod.exe,qt/firo-qt.exe} $ARTIFACT_DIR - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows-binaries path: ${{ env.ARTIFACT_DIR }} @@ -161,7 +168,7 @@ jobs: ARTIFACT_DIR: mac-binaries steps: - name: Getting Source - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: ${{ env.SOURCE_ARTIFACT }} - name: Extract Archives @@ -189,7 +196,7 @@ jobs: mkdir -p $ARTIFACT_DIR mv $SOURCE_ARTIFACT/src/{firo-cli,firo-tx,firod,qt/firo-qt} $ARTIFACT_DIR - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: mac-binaries path: ${{ env.ARTIFACT_DIR }} From 977f2edfb24d764b9f86b147e72671da4e030789 Mon Sep 17 00:00:00 2001 From: firstcryptoman Date: Tue, 16 Jul 2024 00:22:13 +0400 Subject: [PATCH 2/4] more testing --- .github/workflows/ci-master.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index a4ebb9c2bc..f2f4918d76 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -56,14 +56,7 @@ jobs: - name: Getting Source uses: actions/download-artifact@v4 with: - pattern: source-* - merge-multiple: false - run-id: ${{ github.run_id }} - - - name: List downloaded files and directories - run: ls -la - working-directory: ${{ github.workspace }} - + name: ${{ env.SOURCE_ARTIFACT }} - name: Extract Archives run: | tar -xzf depends.tar.gz From ee76f290c9254ed52e64d542103ee5997bdcd4b2 Mon Sep 17 00:00:00 2001 From: firstcryptoman Date: Tue, 16 Jul 2024 00:36:33 +0400 Subject: [PATCH 3/4] Debugging --- .github/workflows/ci-master.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index f2f4918d76..8dff04a4cb 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -57,6 +57,11 @@ jobs: uses: actions/download-artifact@v4 with: name: ${{ env.SOURCE_ARTIFACT }} + path: ${{ github.workspace }}/source + + - name: List files in the source directory + run: ls -la ${{ github.workspace }}/source/ + - name: Extract Archives run: | tar -xzf depends.tar.gz From fd63116aa8eea9b716d46acb6c02cfdc24592628 Mon Sep 17 00:00:00 2001 From: firstcryptoman Date: Tue, 16 Jul 2024 00:43:39 +0400 Subject: [PATCH 4/4] more testing --- .github/workflows/ci-master.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index 8dff04a4cb..2bba2034cb 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -43,7 +43,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.SOURCE_ARTIFACT }} + name: ${{ env.SOURCE_ARTIFACT }}-${{ github.run_id }} path: ${{ env.ARTIFACT_DIR }} build-linux: name: Build for Linux @@ -56,52 +56,46 @@ jobs: - name: Getting Source uses: actions/download-artifact@v4 with: - name: ${{ env.SOURCE_ARTIFACT }} - path: ${{ github.workspace }}/source - - - name: List files in the source directory - run: ls -la ${{ github.workspace }}/source/ - + name: ${{ env.SOURCE_ARTIFACT }}-${{ github.run_id }} - name: Extract Archives run: | tar -xzf depends.tar.gz tar -xzf firo-*.tar.gz --strip-components=1 - working-directory: ${{ env.SOURCE_ARTIFACT }} + working-directory: ${{ github.workspace }}/${{ env.SOURCE_ARTIFACT }} - name: Install Required Packages run: | sudo apt-get update sudo apt-get install -y python3-zmq - name: Build Dependencies run: make -C depends -j$(nproc) - working-directory: ${{ env.SOURCE_ARTIFACT }} + working-directory: ${{ github.workspace }}/${{ env.SOURCE_ARTIFACT }} - name: Build Firo run: | ./configure --disable-jni --enable-tests --with-comparison-tool=no --prefix=$(realpath depends/x86_64-pc-linux-gnu) make -j$(nproc) - working-directory: ${{ env.SOURCE_ARTIFACT }} + working-directory: ${{ github.workspace }}/${{ env.SOURCE_ARTIFACT }} - name: Run Unit Tests run: make check - working-directory: ${{ env.SOURCE_ARTIFACT }} + working-directory: ${{ github.workspace }}/${{ env.SOURCE_ARTIFACT }} - name: Run RPC Tests env: TIMEOUT: 600 run: qa/pull-tester/rpc-tests.py -extended - working-directory: ${{ env.SOURCE_ARTIFACT }} + working-directory: ${{ github.workspace }}/${{ env.SOURCE_ARTIFACT }} - name: Prepare Files for Artifact run: | mkdir -p $ARTIFACT_DIR - mv $SOURCE_ARTIFACT/src/{firo-cli,firo-tx,firod,qt/firo-qt} $ARTIFACT_DIR + mv src/{firo-cli,firo-tx,firod,qt/firo-qt} $ARTIFACT_DIR - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: linux-binaries + name: linux-binaries-${{ github.run_id }} path: ${{ env.ARTIFACT_DIR }} - name: Prepare Test Logs for Artifact if: failure() run: | - tor_log=$SOURCE_ARTIFACT/src/tor/test-suite.log - firo_log=$SOURCE_ARTIFACT/src/test-suite.log - + tor_log=src/tor/test-suite.log + firo_log=src/test-suite.log mkdir -p $TEST_LOG_ARTIFACT_DIR if test -f $tor_log; then