Skip to content

Commit ecd1ded

Browse files
authored
Merge pull request #322 from open-edge-platform/dev/hemanthk/dev_version
Dev/hemanthk/dev version
2 parents b831d13 + 650f196 commit ecd1ded

File tree

8 files changed

+39
-10
lines changed

8 files changed

+39
-10
lines changed

.github/workflows/pre-merge.yml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ jobs:
8787
fail-fast: false
8888
matrix:
8989
project_folder: ${{ fromJson(needs.pre-checks.outputs.filtered_projects) }}
90+
exclude:
91+
- project_folder: baremetal
92+
- project_folder: helm
9093
uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@8fc2349c02d438e1707f99343069963fb49d3eba # 2026.0.6
9194
with:
9295
run_security_scans: true
@@ -103,18 +106,44 @@ jobs:
103106
version_suffix: "-pr-${{ github.event.number }}"
104107
secrets: # zizmor: ignore[secrets-inherit]
105108
inherit
109+
pre-merge-pipeline-no-docker:
110+
permissions:
111+
contents: read
112+
needs: pre-checks
113+
if: ${{ contains(fromJson(needs.pre-checks.outputs.filtered_projects), 'baremetal') || contains(fromJson(needs.pre-checks.outputs.filtered_projects), 'helm') }}
114+
strategy:
115+
fail-fast: false
116+
matrix:
117+
project_folder: [baremetal, helm]
118+
uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@8fc2349c02d438e1707f99343069963fb49d3eba # 2026.0.6
119+
with:
120+
run_security_scans: true
121+
run_version_check: false
122+
run_build: true
123+
run_lint: true
124+
run_test: true
125+
run_docker_build: false
126+
run_docker_push: false
127+
run_helm_build: true
128+
run_helm_push: true
129+
run_artifact: false
130+
project_folder: ${{ matrix.project_folder }}
131+
version_suffix: "-pr-${{ github.event.number }}"
132+
secrets: # zizmor: ignore[secrets-inherit]
133+
inherit
106134
final-check:
107135
runs-on: ubuntu-latest
108136
if: ${{ always() }}
109-
needs: [pre-merge-root, pre-merge-pipeline]
137+
needs: [pre-merge-root, pre-merge-pipeline, pre-merge-pipeline-no-docker]
110138
steps:
111139
- name: Final Status Check
112140
env:
113141
pre_merge_pipeline: ${{ needs.pre-merge-pipeline.result }}
142+
pre_merge_pipeline_no_docker: ${{ needs.pre-merge-pipeline-no-docker.result }}
114143
pre_merge_root_pipeline: ${{ needs.pre-merge-root.result }}
115144
run: |
116145
117-
results=("pre_merge_root_pipeline" "pre_merge_pipeline")
146+
results=("pre_merge_root_pipeline" "pre_merge_pipeline" "pre_merge_pipeline_no_docker")
118147
status="OK"
119148
120149
for result in "${results[@]}"; do

attestation-manager/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.7
1+
1.4.8-dev

attestation-verifier/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.7
1+
1.4.8-dev

baremetal/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.7
1+
1.4.8-dev

helm/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.7
1+
1.4.8-dev

helm/trusted-workload/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ type: application
1818
# This is the chart version. This version number should be incremented each time you make changes
1919
# to the chart and its templates, including the app version.
2020
# Versions are expected to follow Semantic Versioning (https://semver.org/)
21-
version: 1.4.7
21+
version: 1.4.8-dev
2222

2323
# This is the version number of the application being deployed. This version number should be
2424
# incremented each time you make changes to the application. Versions are not expected to
2525
# follow Semantic Versioning. They should reflect the version the application is using.
2626
# It is recommended to use it with quotes.
27-
appVersion: "1.4.7"
27+
appVersion: "1.4.8-dev"
2828

2929
dependencies:
3030
- name: cc-operator

trusted-workload/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.7
1+
1.4.8-dev
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.7
1+
1.4.8-dev

0 commit comments

Comments
 (0)