Skip to content

Commit 0d87194

Browse files
Update version number in manifest.yml (#756)
Add automation to update version number in manifest.yml. Also, bring required commits from main.
1 parent fe00541 commit 0d87194

File tree

4 files changed

+66
-8
lines changed

4 files changed

+66
-8
lines changed

.github/scripts/manifest_updater.py

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env python3
2+
import os
3+
import argparse
4+
5+
THIS_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
6+
MANIFEST_FILE = os.path.join(THIS_FILE_PATH, '..', '..', 'manifest.yml')
7+
8+
def update_manifest_file(new_version_number):
9+
updated_lines = []
10+
with open(MANIFEST_FILE, 'r') as f:
11+
for line in f:
12+
line = line.strip()
13+
if line.startswith('version'):
14+
updated_lines.append(f'version: "v{new_version_number}"\n')
15+
else:
16+
updated_lines.append(f'{line}\n')
17+
18+
with open(MANIFEST_FILE, 'w') as f:
19+
f.writelines(updated_lines)
20+
21+
def parse_args():
22+
parser = argparse.ArgumentParser()
23+
parser.add_argument('-v', '--version', required=True, help='New version number.')
24+
args = parser.parse_args()
25+
return args
26+
27+
def main():
28+
args = parse_args()
29+
update_manifest_file(args.version)
30+
31+
if __name__ == '__main__':
32+
main()

.github/workflows/auto-release.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,19 @@ jobs:
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6565

66+
- name : Update version number in manifest.yml
67+
working-directory: ./local_kernel
68+
run: |
69+
./.github/scripts/manifest_updater.py -v ${{ github.event.inputs.version_number }}
70+
exit $?
71+
72+
- name : Commit version number change in manifest.yml
73+
working-directory: ./local_kernel
74+
run: |
75+
git add .
76+
git commit -m '[AUTO][RELEASE]: Update version number in manifest.yml'
77+
git push -u origin ${{ github.event.inputs.version_number }}
78+
6679
- name: Generate SBOM
6780
uses: FreeRTOS/CI-CD-Github-Actions/sbom-generator@main
6881
with:
@@ -73,15 +86,15 @@ jobs:
7386
working-directory: ./local_kernel
7487
run: |
7588
git add .
76-
git commit -m 'Update SBOM'
89+
git commit -m '[AUTO][RELEASE]: Update SBOM'
7790
git push -u origin ${{ github.event.inputs.version_number }}
7891
echo "COMMIT_SHA_2=$(git rev-parse HEAD)" >> $GITHUB_ENV
7992
8093
- name: Release
8194
run: |
8295
# Install deps and run
8396
pip install -r ./tools/.github/scripts/release-requirements.txt
84-
./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ env.COMMIT_SHA_2 }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
97+
./tools/.github/scripts/release.py ${{ github.repository_owner }} --kernel-repo-path=local_kernel --kernel-commit=${{ env.COMMIT_SHA_2 }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
8598
exit $?
8699
env:
87100
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/kernel-demos.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,22 @@ jobs:
123123
with:
124124
ref: main
125125
repository: FreeRTOS/FreeRTOS
126-
submodules: 'recursive'
127126
fetch-depth: 1
128127

128+
- name: Fetch Community-Supported-Demos Submodule
129+
shell: bash
130+
run: |
131+
# Fetch Community-Supported-Demos Submodule
132+
echo "::group::Fetch Community-Supported-Demos Submodule"
133+
git submodule update --checkout --init --depth 1 FreeRTOS/Demo/ThirdParty/Community-Supported-Demos
134+
echo "::engdroup::"
135+
if [ "$?" = "0" ]; then
136+
echo -e "\033[32;3mCloned the Community-Supported-Demos\033[0m"
137+
else
138+
echo -e "\033[32;31mCommunity-Supported-Demos Clone Failed...\033[0m"
139+
exit 1
140+
fi
141+
129142
# Checkout user pull request changes
130143
- name: Checkout Pull Request
131144
uses: actions/checkout@v2
@@ -169,7 +182,7 @@ jobs:
169182

170183
- name: Build CORTEX_M0+_RP2040 Demos
171184
shell: bash
172-
working-directory: FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040
185+
working-directory: FreeRTOS/Demo/ThirdParty/Community-Supported-Demos/CORTEX_M0+_RP2040
173186
run: |
174187
git clone https://github.com/raspberrypi/pico-sdk.git
175188
cmake -B build -DPICO_SDK_PATH=pico-sdk -GNinja

portable/Common/mpu_wrappers_v2.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -2133,7 +2133,7 @@
21332133
{
21342134
BaseType_t xReturn = pdFAIL;
21352135
QueueSetMemberHandle_t xInternalQueueSetMemberHandle = NULL;
2136-
QueueSetHandle_t xInternalQueueSetHandle;
2136+
QueueSetHandle_t xInternalQueueSetHandle = NULL;
21372137
int32_t lIndexQueueSet, lIndexQueueSetMember;
21382138

21392139
lIndexQueueSet = ( int32_t ) xQueueSet;
@@ -2215,7 +2215,7 @@
22152215

22162216
const char * MPU_pcQueueGetNameImpl( QueueHandle_t xQueue ) /* PRIVILEGED_FUNCTION */
22172217
{
2218-
const char * pcReturn;
2218+
const char * pcReturn = NULL;
22192219
QueueHandle_t xInternalQueueHandle = NULL;
22202220
int32_t lIndex;
22212221

@@ -2519,7 +2519,7 @@
25192519
{
25202520
BaseType_t xReturn = pdFAIL;
25212521
QueueSetMemberHandle_t xInternalQueueSetMemberHandle = NULL;
2522-
QueueSetHandle_t xInternalQueueSetHandle;
2522+
QueueSetHandle_t xInternalQueueSetHandle = NULL;
25232523
int32_t lIndexQueueSet, lIndexQueueSetMember;
25242524

25252525
lIndexQueueSet = ( int32_t ) xQueueSet;
@@ -3330,7 +3330,7 @@
33303330
const EventBits_t uxBitsToWaitFor,
33313331
TickType_t xTicksToWait ) /* PRIVILEGED_FUNCTION */
33323332
{
3333-
EventBits_t xReturn;
3333+
EventBits_t xReturn = 0;
33343334
EventGroupHandle_t xInternalEventGroupHandle = NULL;
33353335
int32_t lIndex;
33363336

0 commit comments

Comments
 (0)