Skip to content

Commit c10c2d3

Browse files
authored
Merge pull request #71 from ethosengine/staging
Staging into main with lamad-init
2 parents cdaaf12 + a0b94ae commit c10c2d3

126 files changed

Lines changed: 38973 additions & 1148 deletions

File tree

Some content is hidden

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

Jenkinsfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,13 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
249249
when {
250250
not {
251251
anyOf {
252+
branch 'dev'
252253
expression { return env.BRANCH_NAME ==~ /alpha-.+/ }
254+
expression { return env.BRANCH_NAME ==~ /claude\/.+/ }
253255
expression { return env.BRANCH_NAME.contains('alpha') }
256+
// Also check CHANGE_BRANCH for PR builds
257+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH ==~ /claude\/.+/ }
258+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('alpha') }
254259
}
255260
}
256261
}
@@ -310,6 +315,7 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
310315
mkdir -p /tmp/build-context
311316
cp -r elohim-app /tmp/build-context/
312317
cp images/Dockerfile /tmp/build-context/
318+
cp images/nginx.conf /tmp/build-context/
313319
314320
# Build image
315321
cd /tmp/build-context
@@ -479,7 +485,12 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
479485
anyOf {
480486
branch 'dev'
481487
expression { return env.BRANCH_NAME ==~ /feat-.+/ }
488+
expression { return env.BRANCH_NAME ==~ /claude\/.+/ }
482489
expression { return env.BRANCH_NAME.contains('alpha') }
490+
// Also check CHANGE_BRANCH for PR builds
491+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH ==~ /claude\/.+/ }
492+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH ==~ /feat-.+/ }
493+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('alpha') }
483494
}
484495
}
485496
steps {
@@ -533,8 +544,14 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
533544
anyOf {
534545
branch 'dev'
535546
expression { return env.BRANCH_NAME ==~ /feat-.+/ }
547+
expression { return env.BRANCH_NAME ==~ /claude\/.+/ }
536548
expression { return env.BRANCH_NAME ==~ /alpha-.+/ }
537549
expression { return env.BRANCH_NAME.contains('alpha') }
550+
// Also check CHANGE_BRANCH for PR builds
551+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH ==~ /claude\/.+/ }
552+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH ==~ /feat-.+/ }
553+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH ==~ /alpha-.+/ }
554+
expression { return env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('alpha') }
538555
}
539556
}
540557
steps {

README.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,26 @@ This manifesto proposes technology that actively defends against corruption whil
4343
## Repository Structure
4444

4545
```
46-
elohim-app/ # Angular application
47-
├── src/app/components/
48-
│ ├── hero/ # Protocol introduction
49-
│ ├── crisis/ # Analysis of current failures
50-
│ ├── elohim-host/ # Autonomous AI guardians
51-
│ ├── vision/ # Future possibilities
46+
elohim-app/ # Angular application (Main Platform)
47+
├── src/app/components/ # Feature components
48+
│ ├── hero/ # Protocol introduction
49+
│ ├── crisis/ # Analysis of current failures
50+
│ ├── elohim-host/ # Autonomous AI guardians
51+
│ ├── vision/ # Future possibilities
5252
│ ├── design-principles/ # Technical implementation
5353
│ ├── learning-success/ # Proven models
5454
│ ├── path-forward/ # Implementation steps
5555
│ ├── call-to-action/ # The choice ahead
56-
│ └── footer/ # Closing message
57-
├── src/styles.css # Global design system
58-
└── devfile.yaml # Development environment config
56+
│ └── footer/ # Closing message
57+
├── src/styles.css # Global design system
58+
└── devfile.yaml # Development environment config
59+
60+
elohim-library/ # Angular Workspace for Shared Libraries
61+
└── projects/
62+
└── lamad-ui/ # "Lamad" UI Pattern Library (Hexagon Grid, etc.)
63+
64+
elohim-ui-playground/ # Component Showcase & Pattern Library App
65+
└── src/app/ # Demos for shared library components
5966
```
6067

6168
## Development

0 commit comments

Comments
 (0)