From 3d5142d6ad75316d4e4603b225a72aa7d0af7a73 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 19 May 2022 01:03:41 +0200 Subject: [PATCH 1/4] Fix error with CI Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 43 ++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ea055a..0c6be13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,21 +18,35 @@ jobs: name: base runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: checkout code + uses: actions/checkout@v3 + with: + submodules: "recursive" + fetch-depth: 1 + - name: build - run: make base + uses: nick-fields/retry@v2 + with: + timeout_seconds: 20 + max_attempts: 5 + retry_on: error + command: make base + - name: test run: make base.test + - name: archive base run: | mkdir -p cache docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz + - name: save base uses: actions/upload-artifact@v3 with: name: cache path: ./cache retention-days: 1 + - name: deploy if: github.ref == 'refs/heads/master' run: | @@ -833,17 +847,31 @@ jobs: cpython_arg: "", } steps: - - uses: actions/checkout@v3 + - name: checkout code + uses: actions/checkout@v3 + with: + submodules: "recursive" + fetch-depth: 1 + - uses: actions/download-artifact@v3 with: name: cache path: ./cache + - name: load base run: xz -d -k < ./cache/base.tar.xz | docker load + - name: build - run: make ${{ matrix.arch_name.image }} + uses: nick-fields/retry@v2 + with: + timeout_seconds: 20 + max_attempts: 5 + retry_on: error + command: make ${{ matrix.arch_name.image }} + - name: basic test run: make ${{ matrix.arch_name.image }}.test + # Updated on 28/08/2021 - name: stockfish build test if: ${{ matrix.arch_name.stockfish == 'yes' }} @@ -854,6 +882,7 @@ jobs: ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j2 cd ../.. rm -rf Stockfish + # Updated on 28/08/2021 - name: ninja build test if: ${{ matrix.arch_name.ninja == 'yes' }} @@ -861,6 +890,7 @@ jobs: git clone --depth 1 --branch v1.10.2 https://github.com/ninja-build/ninja.git cd ninja ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.ninja_arg }} + # Updated on 28/08/2021 - name: openssl build test if: ${{ matrix.arch_name.openssl == 'yes' }} @@ -873,6 +903,7 @@ jobs: ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 cd .. rm -rf openssl + # Updated on 28/08/2021 - name: C build test if: ${{ matrix.arch_name.C == 'yes' }} @@ -883,6 +914,7 @@ jobs: ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C_arg }} cd .. rm -rf C + # Updated on 28/08/2021 - name: C-Plus-Plus build test if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }} @@ -893,6 +925,7 @@ jobs: ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }} cd .. rm -rf C-Plus-Plus + # Updated on 28/08/2021 - name: fmt build test if: ${{ matrix.arch_name.fmt == 'yes' }} @@ -902,6 +935,7 @@ jobs: ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.fmt_arg }} -DFMT_DOC=OFF cd .. rm -rf fmt + # Updated on 05/10/2021 - name: cpython build test if: ${{ matrix.arch_name.cpython == 'yes' }} @@ -912,6 +946,7 @@ jobs: ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 cd .. rm -rf cpython + - name: deploy if: github.ref == 'refs/heads/master' run: | From 63514041f6819c79136f621138efea8060441411 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 19 May 2022 01:20:36 +0200 Subject: [PATCH 2/4] Fix error Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c6be13..d4d9400 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,8 +27,8 @@ jobs: - name: build uses: nick-fields/retry@v2 with: - timeout_seconds: 20 - max_attempts: 5 + retry_wait_seconds: 40 + max_attempts: 3 retry_on: error command: make base @@ -864,8 +864,8 @@ jobs: - name: build uses: nick-fields/retry@v2 with: - timeout_seconds: 20 - max_attempts: 5 + retry_wait_seconds: 20 + max_attempts: 3 retry_on: error command: make ${{ matrix.arch_name.image }} From c0681806653ead85dc380bb2db8b456aa5f66589 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 19 May 2022 01:27:21 +0200 Subject: [PATCH 3/4] Add timeout on CI Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4d9400..19069cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: - name: build uses: nick-fields/retry@v2 with: + timeout_minutes: 120 retry_wait_seconds: 40 max_attempts: 3 retry_on: error @@ -864,6 +865,7 @@ jobs: - name: build uses: nick-fields/retry@v2 with: + timeout_minutes: 360 retry_wait_seconds: 20 max_attempts: 3 retry_on: error From 7876c21e62bcd8b459e9060b6bf19c33f799c7a4 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 19 May 2022 11:05:42 +0200 Subject: [PATCH 4/4] Add retry on deploy step Add retry on deploy step Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 19069cc..501f123 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,9 +50,15 @@ jobs: - name: deploy if: github.ref == 'refs/heads/master' - run: | - docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} - docker image push dockcross/base --all-tags + uses: nick-fields/retry@v2 + with: + timeout_minutes: 30 + retry_wait_seconds: 30 + max_attempts: 4 + retry_on: error + command: | + docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} + docker image push dockcross/base --all-tags image: name: ${{ matrix.arch_name.image }} @@ -951,6 +957,12 @@ jobs: - name: deploy if: github.ref == 'refs/heads/master' - run: | - docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} - docker image push dockcross/${{ matrix.arch_name.image }} --all-tags + uses: nick-fields/retry@v2 + with: + timeout_minutes: 30 + retry_wait_seconds: 30 + max_attempts: 4 + retry_on: error + command: | + docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} + docker image push dockcross/${{ matrix.arch_name.image }} --all-tags