Skip to content

Commit 1da64d3

Browse files
committed
Merge branch 'hotfix/26.1.1'
2 parents b645862 + c103ba9 commit 1da64d3

4 files changed

Lines changed: 46 additions & 2 deletions

File tree

‎CHANGELOG‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
ChangeLog
33
*********
44

5+
26.1.1 (2026-09-01)
6+
===================
7+
- Hotfix to add build_spec.yaml for OCI CI/CD.
8+
59
26.1.0 (2026-04-28)
610
===================
711
- Rewrite legacy OSF file urls to point to downloadable url.

‎build_spec.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: 0.1
2+
component: build
3+
timeoutInSeconds: 3600
4+
shell: bash
5+
failImmediatelyOnError: true
6+
env:
7+
variables:
8+
GENERIC_BUILD_PIPELINE_OCID: "ocid1.devopsbuildpipeline.oc1.iad.amaaaaaa2jd6obqazeiqmcdnextophmsh2n5a5zt5aoty5hrddd5n6b5rmhq"
9+
HELM_CHART_NAME: "mfr"
10+
GIT_REPO_URL: "https://github.com/CenterForOpenScience/modular-file-renderer.git"
11+
steps:
12+
- type: Command
13+
name: "Install jq"
14+
command: |
15+
VERSION=1.8.2
16+
PLATFORM=linux-amd64
17+
wget https://github.com/jqlang/jq/releases/download/jq-${VERSION}/jq-${PLATFORM} -O /usr/local/bin/jq &&\
18+
chmod +x /usr/local/bin/jq
19+
- type: Command
20+
name: "Trigger Generic CICD Pipes"
21+
command: |
22+
GIT_BRANCH="${OCI_PRIMARY_SOURCE_BRANCH_NAME}"
23+
GIT_COMMIT="${OCI_PRIMARY_SOURCE_COMMIT_HASH}"
24+
# Trigger generic pipes with vars/params
25+
build_run_arguments=$(jq -cn \
26+
--arg helm_chart_name "${HELM_CHART_NAME}" \
27+
--arg git_repo_url "${GIT_REPO_URL}" \
28+
--arg git_branch "${GIT_BRANCH}" \
29+
--arg git_commit "${GIT_COMMIT}" \
30+
'{"items": [
31+
{"name": "HELM_CHART_NAME", "value": $helm_chart_name},
32+
{"name": "GIT_REPO_URL", "value": $git_repo_url},
33+
{"name": "GIT_BRANCH", "value": $git_branch},
34+
{"name": "GIT_COMMIT", "value": $git_commit}
35+
]}')
36+
37+
oci devops build-run create \
38+
--build-pipeline-id "${GENERIC_BUILD_PIPELINE_OCID}" \
39+
--display-name "build-${HELM_CHART_NAME}-${GIT_BRANCH}-${GIT_COMMIT}" \
40+
--build-run-arguments "${build_run_arguments}"

‎mfr/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '26.1.0'
1+
__version__ = '26.1.1'

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "mfr"
3-
version = "26.1.0"
3+
version = "26.1.1"
44
description = "Modular File Renderer"
55
authors = ["Center for Open Science <contact@cos.io>"]
66
readme = "README.md"

0 commit comments

Comments
 (0)