mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 00:14:26 +01:00
fix merge
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
parent
267bdda5e3
commit
c644f3fe46
24
.github/workflows/main.yml
vendored
24
.github/workflows/main.yml
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user