Compare commits

..

3 Commits

Author SHA1 Message Date
b90f7052ec Return to 9 compress level, insufficient time reduction
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2022-05-20 13:27:06 +02:00
91ecbfe91e Remove retry from CI
Remove retry from CI

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2022-05-20 13:07:31 +02:00
228e4c18cc Update with better retry methods
Update with better retry methods

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2022-05-20 12:54:08 +02:00
2 changed files with 6 additions and 31 deletions

View File

@ -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: make base
- name: test
run: make base.test
@ -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: make ${{ matrix.arch_name.image }}
- 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

View File

@ -1,5 +1,4 @@
ARG DOCKER_IMAGE_VERSION=3.1.10
FROM emscripten/emsdk:$DOCKER_IMAGE_VERSION
FROM emscripten/emsdk:3.1.5
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
@ -57,7 +56,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.webassembly"
ENV EMSCRIPTEN_VERSION $DOCKER_IMAGE_VERSION
ENV EMSCRIPTEN_VERSION 3.1.5
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
ENV CC=/emsdk/upstream/emscripten/emcc \