Skip to content

Commit ff89d8e

Browse files
committed
Merge tag '26.17.1' into develop
Hotfix to add OCI build spec 26.17.1
2 parents 1114dab + 0961d94 commit ff89d8e

4 files changed

Lines changed: 48 additions & 2 deletions

File tree

‎.prettierignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ yarn-error.log
3535
testem.log
3636
/typings
3737
/public
38+
build_spec.yaml
3839

3940
# System files
4041
.DS_Store
41-
Thumbs.db
42+
Thumbs.db

‎CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
44

5+
26.17.1 (2026-09-01)
6+
====================
7+
8+
* Hotfix to add OCI build spec
9+
510
26.17.0 (2026-08-31)
611
====================
712

‎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: "angular-osf"
10+
GIT_REPO_URL: "https://github.com/CenterForOpenScience/angular-osf.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}"

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "osf",
3-
"version": "26.17.0",
3+
"version": "26.17.1",
44
"scripts": {
55
"ng": "ng",
66
"analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",

0 commit comments

Comments
 (0)