Skip to content

Commit

Permalink
Merge pull request #1461 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
osal Integration candidate: Equuleus-rc1+dev12
  • Loading branch information
dzbaker authored May 21, 2024
2 parents 372ea65 + 2d3551d commit 6483329
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-osal-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: sudo apt-get install doxygen graphviz -y

- name: Checkout submodule
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up for build
run: |
Expand All @@ -45,7 +45,7 @@ jobs:
mv build/docs/osal-apiguide-warnings.log osal-apiguide-warnings.log
- name: Archive Osal Guide Build Logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: OSAL Guide Artifacts
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/icbundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
sudo apt update
sudo apt install -y w3m
- name: Checkout IC Branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: '0'
ref: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/standalone-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:

- name: Checkout OSAL
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: source

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: equuleus-rc1+dev66
- Adds node20 compatible github actions
- See <https://github.com/nasa/osal/pull/1460>

## Development Build: equuleus-rc1+dev62
- Break up pc-rtems to support generic configuration and add tarfs support
- See <https://github.com/nasa/osal/pull/1350>
Expand Down
2 changes: 1 addition & 1 deletion src/os/inc/osapi-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 62
#define OS_BUILD_NUMBER 66
#define OS_BUILD_BASELINE "equuleus-rc1"
#define OS_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define OS_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down

0 comments on commit 6483329

Please sign in to comment.