Skip to content

Commit

Permalink
Merge branch 'main' into humble
Browse files Browse the repository at this point in the history
  • Loading branch information
ajtudela committed Jan 10, 2025
2 parents ada1c73 + d29d192 commit 9d57041
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,9 @@ jobs:
flags: unittests
name: codecov-umbrella
slug: grupo-avispa/scitos2
- name: Upload test results to Codecov
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: unittests
10 changes: 3 additions & 7 deletions .github/workflows/docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,19 @@ on:
workflow_dispatch:
workflow_run:
workflows: ["Build"]
branches:
- main
- humble
branches: [main, humble]
types:
- completed

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
docker-image:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout
uses: actions/[email protected]
with:
ref: ${{ github.event.workflow_run.head_branch }}

- name: Extract metadata (tags, labels) for Docker
id: meta
Expand Down

0 comments on commit 9d57041

Please sign in to comment.