From 228e4c18ccfdc58a117780e1a2d52f9cf9a23aa4 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 20 May 2022 12:54:08 +0200 Subject: [PATCH 1/3] Update with better retry methods Update with better retry methods Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88a847e..cff7a1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,13 +25,7 @@ jobs: fetch-depth: 1 - name: build - uses: nick-fields/retry@v2 - with: - timeout_minutes: 120 - retry_wait_seconds: 40 - max_attempts: 3 - retry_on: error - command: make base + run: for i in {1..3}; do make base && break || sleep 30; done - name: test run: make base.test @@ -39,7 +33,7 @@ jobs: - name: archive base run: | mkdir -p cache - docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz + docker save dockcross/base:latest | xz -e7 -T0 > ./cache/base.tar.xz - name: save base uses: actions/upload-artifact@v3 @@ -50,13 +44,7 @@ jobs: - name: deploy if: github.ref == 'refs/heads/master' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 30 - retry_wait_seconds: 30 - max_attempts: 4 - retry_on: error - command: | + run: | docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} docker image push dockcross/base --all-tags @@ -869,13 +857,7 @@ jobs: run: xz -d -k < ./cache/base.tar.xz | docker load - name: build - uses: nick-fields/retry@v2 - with: - timeout_minutes: 360 - retry_wait_seconds: 20 - max_attempts: 3 - retry_on: error - command: make ${{ matrix.arch_name.image }} + run: for i in {1..3}; do make ${{ matrix.arch_name.image }} && break || sleep 30; done - name: basic test run: make ${{ matrix.arch_name.image }}.test @@ -957,12 +939,6 @@ jobs: - name: deploy if: github.ref == 'refs/heads/master' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 30 - retry_wait_seconds: 30 - max_attempts: 4 - retry_on: error - command: | + run: | docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} docker image push dockcross/${{ matrix.arch_name.image }} --all-tags From 91ecbfe91e832385fd2b9fc2a53c4fa2f5e7e8d4 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 20 May 2022 13:07:31 +0200 Subject: [PATCH 2/3] Remove retry from CI Remove retry from CI Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cff7a1e..a585a13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: fetch-depth: 1 - name: build - run: for i in {1..3}; do make base && break || sleep 30; done + run: make base - name: test run: make base.test @@ -857,7 +857,7 @@ jobs: run: xz -d -k < ./cache/base.tar.xz | docker load - name: build - run: for i in {1..3}; do make ${{ matrix.arch_name.image }} && break || sleep 30; done + run: make ${{ matrix.arch_name.image }} - name: basic test run: make ${{ matrix.arch_name.image }}.test From b90f7052ec7454fbedbf095d7c1913d3001c68ab Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 20 May 2022 13:27:06 +0200 Subject: [PATCH 3/3] Return to 9 compress level, insufficient time reduction Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a585a13..6de5bee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: - name: archive base run: | mkdir -p cache - docker save dockcross/base:latest | xz -e7 -T0 > ./cache/base.tar.xz + docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz - name: save base uses: actions/upload-artifact@v3