From d983e2d73a484bc117c7f8851bf2e46042fc0853 Mon Sep 17 00:00:00 2001 From: Roman Nikonov Date: Sun, 22 Dec 2024 19:44:49 +0100 Subject: [PATCH 1/4] internal: remove unnecessary step from Ubuntu CI --- .github/workflows/pr-ubuntu-docker.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/pr-ubuntu-docker.yml b/.github/workflows/pr-ubuntu-docker.yml index d1d7e54956..56a655506c 100644 --- a/.github/workflows/pr-ubuntu-docker.yml +++ b/.github/workflows/pr-ubuntu-docker.yml @@ -72,24 +72,18 @@ jobs: options: | -v ${{github.workspace}}:/src -u skymp - --name configure_container run: | cd /src \ && ./build.sh --configure \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -DUNIT_DATA_DIR="/src/skyrim_data_files" - - name: Copy log file from container to workspace - if: failure() - run: | - sudo docker cp configure_container:/src/vcpkg/buildtrees/rsm-bsa/install-x64-linux-dbg-out.log ${{github.workspace}}/install-x64-linux-dbg-out.log - - name: Upload vcpkg failure logs if: failure() uses: actions/upload-artifact@v4 with: name: install-x64-linux-dbg-out.log - path: ${{github.workspace}}/install-x64-linux-dbg-out.log + path: ${{github.workspace}}/vcpkg/buildtrees/rsm-bsa/install-x64-linux-dbg-out.log - name: Upload compile_commands.json uses: actions/upload-artifact@v4 From 18e69d65b6557a5c5ebb0c65fce3f1ae7d21294b Mon Sep 17 00:00:00 2001 From: Roman Nikonov Date: Sun, 22 Dec 2024 19:45:00 +0100 Subject: [PATCH 2/4] test failure --- .github/workflows/pr-ubuntu-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ubuntu-docker.yml b/.github/workflows/pr-ubuntu-docker.yml index 56a655506c..93030a2692 100644 --- a/.github/workflows/pr-ubuntu-docker.yml +++ b/.github/workflows/pr-ubuntu-docker.yml @@ -76,7 +76,7 @@ jobs: cd /src \ && ./build.sh --configure \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ - -DUNIT_DATA_DIR="/src/skyrim_data_files" + -DUNIT_DATA_DIR="/src/skyrim_data_files" && false - name: Upload vcpkg failure logs if: failure() From f9b17c7513df01ff3f127bb8db081d5b2726b1bf Mon Sep 17 00:00:00 2001 From: Roman Nikonov Date: Sun, 22 Dec 2024 19:48:36 +0100 Subject: [PATCH 3/4] proof --- .github/workflows/pr-ubuntu-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ubuntu-docker.yml b/.github/workflows/pr-ubuntu-docker.yml index 93030a2692..db77517947 100644 --- a/.github/workflows/pr-ubuntu-docker.yml +++ b/.github/workflows/pr-ubuntu-docker.yml @@ -76,7 +76,7 @@ jobs: cd /src \ && ./build.sh --configure \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ - -DUNIT_DATA_DIR="/src/skyrim_data_files" && false + -DUNIT_DATA_DIR="/src/skyrim_data_files" && echo kek > vcpkg/buildtrees/rsm-bsa/install-x64-linux-dbg-out.log && false - name: Upload vcpkg failure logs if: failure() From e75cfd11bdedbb150b6b2f2c0f4902d410960ce6 Mon Sep 17 00:00:00 2001 From: Roman Nikonov Date: Sun, 22 Dec 2024 19:53:34 +0100 Subject: [PATCH 4/4] revert --- .github/workflows/pr-ubuntu-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ubuntu-docker.yml b/.github/workflows/pr-ubuntu-docker.yml index db77517947..56a655506c 100644 --- a/.github/workflows/pr-ubuntu-docker.yml +++ b/.github/workflows/pr-ubuntu-docker.yml @@ -76,7 +76,7 @@ jobs: cd /src \ && ./build.sh --configure \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ - -DUNIT_DATA_DIR="/src/skyrim_data_files" && echo kek > vcpkg/buildtrees/rsm-bsa/install-x64-linux-dbg-out.log && false + -DUNIT_DATA_DIR="/src/skyrim_data_files" - name: Upload vcpkg failure logs if: failure()