Skip to content

Commit ce14838

Browse files
authored
Merge branch 'master' into fix/shared-with-everyone-filter
2 parents 120c5cd + 85a0feb commit ce14838

File tree

152 files changed

+3123
-2156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+3123
-2156
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
⬆️ Upgrade dependencies.
1111
📝 Add or update documentation.
1212
🔨 Add or update development scripts.
13+
✅ Add, update or pass tests.
1314
🔒️ Fix security issues.
1415
⚠️ Changes in ops configuration etc. are required before deploying.
1516
[ Please add a link to the associated ops-issue or PR, such as in https://github.com/ITISFoundation/osparc-ops-environments or https://git.speag.com/oSparc/osparc-infra ]
@@ -28,32 +29,16 @@ or from https://gitmoji.dev/
2829

2930

3031
## Related issue/s
31-
32-
<!-- Link pull request to an issue
33-
SEE https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
34-
35-
- resolves ITISFoundation/osparc-issues#428
36-
- fixes #26
37-
-->
32+
<!-- LINK to other issues and add prefix `closes`, `fixes`, `resolves`-->
3833

3934

4035
## How to test
4136

4237
<!-- Give REVIEWERS some hits or code snippets on how could this be tested -->
4338

44-
## Dev-ops checklist
45-
46-
- [ ] No ENV changes or I properly updated ENV ([read the instruction](https://git.speag.com/oSparc/osparc-ops-deployment-configuration/-/blob/configs/README.md?ref_type=heads#how-to-update-env-variables))
47-
48-
<!-- Some checks that might help your code run stable on production, and help devops assess criticality.
49-
Modified from https://oschvr.com/posts/what-id-like-as-sre/
39+
## Dev-ops
5040

51-
- How can DevOps check the health of the service ?
52-
- How can DevOps safely and gracefully restart the service ?
53-
- How and why would this code fail ?
54-
- What kind of metrics are you exposing ?
55-
- Is there any documentation/design specification for the service ?
56-
- How (e.g. through which loglines) can DevOps detect unexpected situations that require escalation to human ?
57-
- What are the resource limitations (CPU, RAM) expected for this service ?
58-
- Are all relevant variables documented and adjustable via environment variables (i.e. no hardcoded magic numbers) ?
41+
<!--
42+
- No changes /updated ENV. SEE https://git.speag.com/oSparc/osparc-ops-deployment-configuration/-/blob/configs/README.md?ref_type=heads#how-to-update-env-variables)
43+
- SEE docs/devops-checklist.md
5944
-->

.github/copilot-instructions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This document provides guidelines and best practices for using GitHub Copilot in
2222
- ensure we use `pydantic` >2 compatible code.
2323
- ensure we use `fastapi` >0.100 compatible code
2424
- use f-string formatting
25+
- Only add comments in function if strictly necessary
2526

2627

2728
### Json serialization
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Reusable Build Images
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
build-backend:
7+
required: true
8+
type: boolean
9+
description: "Whether backend images should be built"
10+
build-frontend:
11+
required: true
12+
type: boolean
13+
description: "Whether frontend images should be built"
14+
python-version:
15+
required: true
16+
type: string
17+
description: "Python version to use"
18+
os:
19+
required: true
20+
type: string
21+
description: "Runner OS to use"
22+
23+
jobs:
24+
build-test-images:
25+
timeout-minutes: 30
26+
runs-on: ${{ inputs.os }}
27+
steps:
28+
- uses: actions/checkout@v4
29+
- name: setup docker buildx
30+
id: buildx
31+
uses: docker/setup-buildx-action@v3
32+
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
38+
- name: build backend images
39+
if: ${{ inputs.build-backend }}
40+
run: |
41+
export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash)
42+
mkdir --parents /${{ runner.temp }}/build
43+
make build local-dest=/${{ runner.temp }}/build exclude=static-webserver
44+
- name: build frontend images
45+
if: ${{ inputs.build-frontend }}
46+
run: |
47+
export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash)
48+
mkdir --parents /${{ runner.temp }}/build
49+
make build local-dest=/${{ runner.temp }}/build target=static-webserver
50+
- name: upload backend artifacts
51+
if: ${{ inputs.build-backend }}
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-backend
55+
path: /${{ runner.temp }}/build
56+
- name: upload frontend artifacts
57+
if: ${{ inputs.build-frontend }}
58+
uses: actions/upload-artifact@v4
59+
with:
60+
name: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-frontend
61+
path: /${{ runner.temp }}/build

.github/workflows/ci-pact-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
python-version: "3.11"
2828
- name: install uv
29-
uses: astral-sh/setup-uv@v5
29+
uses: astral-sh/setup-uv@v6
3030
with:
3131
version: "0.6.x"
3232
enable-cache: false

0 commit comments

Comments
 (0)