Skip to content

Commit 41d53b8

Browse files
authored
Merge branch 'master' into is34/fix-catalog-service-inherit-group-1
2 parents e326307 + 0816baa commit 41d53b8

File tree

35 files changed

+373
-889
lines changed

35 files changed

+373
-889
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: 'Download and Load Docker Images'
2+
description: 'Downloads and loads Docker images for integration/system tests'
3+
4+
inputs:
5+
artifact-name-pattern:
6+
description: 'Artifact name pattern for docker images (e.g., backend, or * for all)'
7+
required: false
8+
default: 'backend'
9+
10+
download-path:
11+
description: 'Path to download artifacts to'
12+
required: false
13+
default: '/${{ runner.temp }}/build'
14+
15+
runs:
16+
using: 'composite'
17+
steps:
18+
# FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
19+
- name: download docker images with retry
20+
uses: Wandalen/wretry.action@master
21+
with:
22+
action: actions/download-artifact@v4
23+
with: |
24+
${{ inputs.artifact-name-pattern == '*' && 'pattern' || 'name' }}: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-${{ inputs.artifact-name-pattern }}
25+
path: ${{ inputs.download-path }}
26+
attempt_limit: 5
27+
attempt_delay: 1000
28+
29+
- name: load docker images
30+
shell: bash
31+
run: make load-images local-src=${{ inputs.download-path }}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: 'Setup SimCore Environment'
2+
description: 'Sets up the common environment for SimCore CI jobs'
3+
4+
inputs:
5+
python-version:
6+
description: 'Python version to use'
7+
required: false
8+
default: '3.11'
9+
10+
uv-version:
11+
description: 'UV version to use'
12+
required: false
13+
default: '0.6.x'
14+
15+
cache-dependency-glob:
16+
description: 'Glob pattern for cache dependency files'
17+
required: false
18+
default: ''
19+
20+
setup-docker:
21+
description: 'Whether to setup Docker BuildX'
22+
required: false
23+
default: 'true'
24+
25+
show-system-versions:
26+
description: 'Whether to show system versions'
27+
required: false
28+
default: 'true'
29+
30+
expose-github-runtime:
31+
description: 'Whether to expose GitHub runtime for buildx (needed for some integration tests)'
32+
required: false
33+
default: 'true'
34+
35+
runs:
36+
using: 'composite'
37+
steps:
38+
- name: Setup Docker BuildX
39+
if: inputs.setup-docker == 'true'
40+
id: buildx
41+
uses: docker/setup-buildx-action@v3
42+
with:
43+
driver: docker-container
44+
45+
- name: Expose GitHub runtime for BuildX
46+
if: inputs.expose-github-runtime == 'true'
47+
uses: crazy-max/ghaction-github-runtime@v3
48+
49+
- name: Setup Python environment
50+
uses: actions/setup-python@v5
51+
with:
52+
python-version: ${{ inputs.python-version }}
53+
54+
- name: Install UV
55+
uses: astral-sh/setup-uv@v6
56+
with:
57+
version: ${{ inputs.uv-version }}
58+
enable-cache: false
59+
cache-dependency-glob: ${{ inputs.cache-dependency-glob }}
60+
61+
- name: Show system versions
62+
if: inputs.show-system-versions == 'true'
63+
shell: bash
64+
run: ./ci/helpers/show_system_versions.bash

.github/workflows/_reusable-build-images.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@ jobs:
2626
runs-on: ${{ inputs.os }}
2727
steps:
2828
- uses: actions/checkout@v4
29-
- name: setup docker buildx
30-
id: buildx
31-
uses: docker/setup-buildx-action@v3
29+
- name: Setup SimCore environment
30+
uses: ./.github/actions/setup-simcore-env
3231
with:
33-
driver: docker-container
34-
- name: expose github runtime for buildx
35-
uses: crazy-max/ghaction-github-runtime@v3
36-
- name: show system environs
37-
run: ./ci/helpers/show_system_versions.bash
32+
python-version: ${{ inputs.python-version }}
33+
expose-github-runtime: 'true'
3834
- name: build backend images
3935
if: ${{ inputs.build-backend }}
4036
run: |

0 commit comments

Comments
 (0)