Skip to content

Commit 8eaad84

Browse files
authored
Merge pull request #12 from project-ocre/cleanup
Changed out init url for https, added next steps after flashing ocre-…
2 parents 594e965 + d4cba5a commit 8eaad84

6 files changed

Lines changed: 39 additions & 33 deletions

File tree

.github/workflows/publish.yml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
# This workflow uses actions that are not certified by GitHub.
2-
# They are provided by a third-party and are governed by
3-
# separate terms of service, privacy policy, and support
4-
# documentation.
5-
6-
# Build and Deploy Ocre Docs to GitHub Pages
71
name: Publish
8-
92
on:
103
push:
114
branches: ["main"]
12-
13-
# Allows you to run this workflow manually from the Actions tab
5+
pull_request:
6+
branches: ["main"]
147
workflow_dispatch:
158

16-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
179
permissions:
1810
contents: read
1911
pages: write
2012
id-token: write
2113

22-
# Allow one concurrent deployment
2314
concurrency:
2415
group: "pages"
2516
cancel-in-progress: true
@@ -34,23 +25,22 @@ jobs:
3425
- name: Setup Ruby
3526
uses: ruby/setup-ruby@v1
3627
with:
37-
ruby-version: '3.3' # Not needed with a .ruby-version file
38-
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
39-
cache-version: 0 # Increment this number if you need to re-download cached gems
28+
ruby-version: '3.4'
29+
bundler-cache: true
30+
cache-version: 0
4031
- name: Setup Pages
4132
id: pages
4233
uses: actions/configure-pages@v5
4334
- name: Build with Jekyll
44-
# Outputs to the './_site' directory by default
4535
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
4636
env:
4737
JEKYLL_ENV: production
4838
- name: Upload artifact
49-
# Automatically uploads an artifact from the './_site' directory by default
5039
uses: actions/upload-pages-artifact@v3
5140

52-
# Deployment job
41+
# Deployment job - only runs on push to main
5342
deploy:
43+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
5444
environment:
5545
name: github-pages
5646
url: ${{ steps.deployment.outputs.page_url }}
@@ -59,4 +49,4 @@ jobs:
5949
steps:
6050
- name: Deploy to GitHub Pages
6151
id: deployment
62-
uses: actions/deploy-pages@v4
52+
uses: actions/deploy-pages@v4

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
source 'https://rubygems.org'
2-
32
gem "jekyll", "~> 4.3.4" # installed by `gem jekyll`
43
# gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2
5-
64
gem "just-the-docs", "0.10.1" # pinned to the current release
75
# gem "just-the-docs" # always download the latest release
6+
gem "csv"
7+
gem "base64"
8+
gem "logger"

Gemfile.lock

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@ GEM
33
specs:
44
addressable (2.8.7)
55
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.2.0)
67
bigdecimal (3.1.9)
78
colorator (1.1.0)
89
concurrent-ruby (1.3.4)
10+
csv (3.3.2)
911
em-websocket (0.5.3)
1012
eventmachine (>= 0.12.9)
1113
http_parser.rb (~> 0)
1214
eventmachine (1.2.7)
1315
ffi (1.17.1-arm64-darwin)
1416
ffi (1.17.1-x86_64-linux-gnu)
1517
forwardable-extended (2.6.0)
16-
google-protobuf (4.29.2-arm64-darwin)
17-
bigdecimal
18-
rake (>= 13)
19-
google-protobuf (4.29.2-x86_64-linux)
18+
google-protobuf (4.29.2)
2019
bigdecimal
2120
rake (>= 13)
2221
http_parser.rb (0.8.0)
@@ -59,6 +58,7 @@ GEM
5958
listen (3.9.0)
6059
rb-fsevent (~> 0.10, >= 0.10.3)
6160
rb-inotify (~> 0.9, >= 0.9.10)
61+
logger (1.6.4)
6262
mercenary (0.4.0)
6363
pathutil (0.16.2)
6464
forwardable-extended (~> 2.6)
@@ -84,8 +84,11 @@ PLATFORMS
8484
x86_64-linux-gnu
8585

8686
DEPENDENCIES
87+
base64
88+
csv
8789
jekyll (~> 4.3.4)
8890
just-the-docs (= 0.10.1)
91+
logger
8992

9093
BUNDLED WITH
9194
2.5.9

docs/quickstart/firmware/hardware.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pip install west
4747

4848
Now, initialize the `ocre-runtime` repo.
4949
```
50-
west init -m git@github.com:project-ocre/ocre-runtime.git
50+
west init -m https://github.com/project-ocre/ocre-runtime.git
5151
```
5252

5353
Lastly, update the repo with the `west` utility.
@@ -57,7 +57,7 @@ west update
5757
```
5858

5959
{: .note}
60-
`west update` may take 5-10 minutes as it pulls all Zephyr Project board sources.
60+
This step may take 5-10 minutes as it pulls all Zephyr Project board sources.
6161

6262
### **5. Install Additional Zephyr (pip) requirements**
6363

@@ -75,7 +75,7 @@ west build -b BOARD_NAME ./application -d build -- -DMODULE_EXT_ROOT=`pwd`/appli
7575
```
7676

7777
{: .note}
78-
You can also run the **West Build** task directly from the **Ocre Workspace** file as defined in the [Ocre Workspace File](../../../reference/workspacefile) reference. If you do, be sure to select your board as your build target from the dropdown list of available boards.
78+
Your board's name can be found in the Zephyr [Supported Boards](https://docs.zephyrproject.org/3.7.0/boards/index.html) guide.
7979

8080
### **7. Flash the Ocre Runtime to Your Device**
8181

@@ -95,4 +95,10 @@ To flash the Ocre Runtime to your device follow these steps:
9595
## Troubleshooting
9696
This section covers common issues you might encounter when building and flashing the Ocre runtime to physical hardware, along with their solutions.
9797

98-
- **Unsupported Board**: If you're unable to flash to your board, and it's not listed in our [Board Support](../../../board-support), check out our [Adding Board Support](../../../board-support/adding-support) guide under the Board Support section. This guide will walk you through the process of adding support for your specific hardware.
98+
- **Unsupported Board**: If you're unable to flash to your board, and it's not listed in our [Board Support](../../../board-support), check out our [Adding Board Support](../../../board-support/adding-support) guide under the Board Support section. This guide will walk you through the process of adding support for your specific hardware.
99+
100+
---
101+
102+
## Next Steps
103+
104+
Now that you have successfully built and flashed the Ocre runtime to your device, you're ready to create your first Ocre application. Head over to [Your First Container](../../first-app) to get started building containerized applications.

docs/quickstart/firmware/simulated.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pip install west
5555

5656
Now, initialize the `ocre-runtime` repo.
5757
```
58-
west init -m git@github.com:project-ocre/ocre-runtime.git
58+
west init -m https://github.com/project-ocre/ocre-runtime.git
5959
```
6060

6161
Lastly, update the repo with the `west` utility.
@@ -65,7 +65,7 @@ west update
6565
```
6666

6767
{: .note}
68-
`west update` may take 5-10 minutes as it pulls all Zephyr Project board sources.
68+
This step may take 5-10 minutes as it pulls all Zephyr Project board sources.
6969

7070
### **5. Install Additional Zephyr (pip) requirements**
7171

@@ -94,4 +94,10 @@ To run the application, simply run the following command:
9494

9595
If successful, you should see the following output:
9696

97-
![](../success.png)
97+
![](../success.png)
98+
99+
---
100+
101+
## Next Steps
102+
103+
Now that you have successfully built and flashed the Ocre runtime to your device, you're ready to create your first Ocre application. Head over to [Your First Container](../../first-app) to get started building containerized applications.

docs/quickstart/first-app/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ has_children: true
77
has_toc: false
88
---
99

10-
# Your First App
10+
# Your First Container
1111

1212
This section guides you through creating your first containerized application with Ocre. You'll set up a development environment and build a simple application that demonstrates Ocre's core capabilities.
1313

1414
---
1515

1616
## Getting Started
1717

18-
Begin by following our [Setting Up Your Development Environment](./dev-environment) guide to install and configure the necessary tools. This guide offers two approaches:
18+
Begin by following our [Setting Up Your Development Environment](./dev-environment) guide to install and configure the necessary tools. This guide offers *two* approaches:
1919
- Using Visual Studio Code with Dev Containers for an integrated IDE experience
2020
- Using Docker interactively for a command-line workflow
2121

0 commit comments

Comments
 (0)