Skip to content

Commit

Permalink
Merge pull request #7 from h2020charisma/ops-updates
Browse files Browse the repository at this point in the history
- run ops workflows for branch `develop` too
- upgrade vulnerable dependencies
- other minor corrections
  • Loading branch information
kerberizer authored Jun 7, 2024
2 parents f47c283 + ecfc990 commit 101ee67
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 24 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ on: # yamllint disable-line rule:truthy
push:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
workflow_dispatch:

env:
Expand Down Expand Up @@ -140,7 +142,7 @@ jobs:
# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: github.event_name != 'pull_request'
uses: sigstore/[email protected]
with:
cosign-release: 'v2.2.4'
Expand All @@ -152,7 +154,7 @@ jobs:
# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: github.event_name != 'pull_request'
uses: docker/[email protected]
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -167,6 +169,7 @@ jobs:
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/develop' }}
type=raw,value=stable,enable=${{ github.ref == 'refs/heads/main' }}
type=ref,event=branch
type=ref,event=tag
Expand All @@ -179,7 +182,7 @@ jobs:
uses: docker/[email protected]
with:
context: .
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand All @@ -191,7 +194,7 @@ jobs:
# transparency data even for private images, pass --force to cosign below.
# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: github.event_name != 'pull_request'
env:
# https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
TAGS: ${{ steps.meta.outputs.tags }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN sed -i 's/^-e //' /tmp/requirements.txt \
&& pip install --no-cache-dir --upgrade -r /tmp/requirements.txt \
&& rm /tmp/requirements.txt

COPY ./src/spectrastream /app
COPY ./src/spectrastream /app

WORKDIR /app

Expand Down
49 changes: 30 additions & 19 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 101ee67

Please sign in to comment.