fix merge

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2022-05-20 13:33:15 +02:00
parent 267bdda5e3
commit c644f3fe46

View File

@ -50,13 +50,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 +863,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 +945,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