secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Separating meta for release vs edge

Browse Source
This commit is contained in:
James Barnsley
2023-01-02 22:06:27 +13:00
parent 8c4b166c06
commit b5f9baa17d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View File

@ -137,7 +137,7 @@ jobs:
- name: Generating release tags and labels - name: Generating release tags and labels
if: github.event_name == 'release' if: github.event_name == 'release'
id: meta id: release_meta
uses: docker/metadata-action@v4 uses: docker/metadata-action@v4
with: with:
images: jaedb/iris images: jaedb/iris
@ -146,9 +146,9 @@ jobs:
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
- name: Generating branch labels - name: Generating edge branch labels
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
id: meta id: edge_meta
uses: docker/metadata-action@v4 uses: docker/metadata-action@v4
with: with:
images: jaedb/iris images: jaedb/iris
@ -164,5 +164,5 @@ jobs:
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.release_meta.outputs.tags || steps.edge_meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.release_meta.outputs.labels || steps.edge_meta.outputs.tags }}