mirror of
https://github.com/xuthus83/pigallery2.git
synced 2024-11-03 21:04:03 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1edb07dbf9
16
.github/workflows/build.yml
vendored
16
.github/workflows/build.yml
vendored
@ -102,9 +102,6 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set tag
|
|
||||||
id: vars
|
|
||||||
run: echo "{tag}={$(echo ${GITHUB_REF:10})}" >> $GITHUB_STATE && echo "{type}={$(echo ${GITHUB_REF:5})}" >> $GITHUB_STATE
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- uses: actions/download-artifact@v3
|
- uses: actions/download-artifact@v3
|
||||||
@ -136,7 +133,8 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
tags: bpatrik/pigallery2:experimental-${{ matrix.container }}
|
tags: bpatrik/pigallery2:experimental-${{ matrix.container }}
|
||||||
- name: Push nightly on new master commit
|
- name: Push nightly on new master commit
|
||||||
if: ${{ startsWith(steps.vars.outputs.type , 'head') && !github.event.issue.pull_request && github.ref == 'refs/heads/master' }}
|
# github.ref: branches the format is refs/heads/<branch_name> PRs and Tags are different
|
||||||
|
if: ${{github.ref == 'refs/heads/master' }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@ -145,7 +143,7 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
tags: bpatrik/pigallery2:nightly-${{ matrix.container }}
|
tags: bpatrik/pigallery2:nightly-${{ matrix.container }}
|
||||||
- name: Push release on new Tag
|
- name: Push release on new Tag
|
||||||
if: ${{ startsWith(steps.vars.outputs.type , 'tag') && !github.event.issue.pull_request && matrix.container != 'debian-bullseye'}}
|
if: ${{ startsWith(github.ref_type , 'tag') && !github.event.issue.pull_request && matrix.container != 'debian-bullseye'}}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@ -154,10 +152,10 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
bpatrik/pigallery2:nightly-${{ matrix.container }}
|
bpatrik/pigallery2:nightly-${{ matrix.container }}
|
||||||
bpatrik/pigallery2:${{ steps.vars.outputs.tag }}-${{ matrix.container }}
|
bpatrik/pigallery2:${{ github.ref_name }}-${{ matrix.container }}
|
||||||
bpatrik/pigallery2:latest-${{ matrix.container }}
|
bpatrik/pigallery2:latest-${{ matrix.container }}
|
||||||
- name: Push latest on new Tag
|
- name: Push latest on new Tag
|
||||||
if: ${{ startsWith(steps.vars.outputs.type , 'tag') && !github.event.issue.pull_request && matrix.container == 'debian-bullseye'}}
|
if: ${{ startsWith(github.ref_type, 'tag') && !github.event.issue.pull_request && matrix.container == 'debian-bullseye'}}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@ -166,7 +164,7 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
bpatrik/pigallery2:nightly-${{ matrix.container }}
|
bpatrik/pigallery2:nightly-${{ matrix.container }}
|
||||||
bpatrik/pigallery2:${{ steps.vars.outputs.tag }}-${{ matrix.container }}
|
bpatrik/pigallery2:${{ github.ref_name }}-${{ matrix.container }}
|
||||||
bpatrik/pigallery2:latest-${{ matrix.container }}
|
bpatrik/pigallery2:latest-${{ matrix.container }}
|
||||||
bpatrik/pigallery2:${{ steps.vars.outputs.tag }}
|
bpatrik/pigallery2:${{ github.ref_name }}
|
||||||
bpatrik/pigallery2:latest
|
bpatrik/pigallery2:latest
|
||||||
|
Loading…
Reference in New Issue
Block a user