Skip to content

Commit

Permalink
🔀 Merge branch 'ladislas/bugfix/ci-workflows-fix-typo-licence' into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
ladislas committed Feb 27, 2023
2 parents d39f4bd + 5a79f8d commit c00770c
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/actions/check_version/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ runs:
with:
header: publish_version
message: |
# Version comparison
# :bookmark: Version comparison
${{ env.VERSION_COMPARISON_OUTPUT }}
Expand Down
5 changes: 2 additions & 3 deletions .github/actions/check_version/generate_report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ echo "Creating markdown output"

echo 'VERSION_COMPARISON_OUTPUT<<EOF_VERSION_COMPARISON_OUTPUT' >> $GITHUB_ENV

echo -n "| - | Version | Same as filename | Same as os_version |\n" >> $GITHUB_ENV
echo -n "| | Version | Same as filename | Same as os_version |\n" >> $GITHUB_ENV
echo -n "|:---------------------------------:|:--------------------------:|:----------------:|:--------------------:|\n" >> $GITHUB_ENV

echo -n "| **os** |\`$OUTPUT_OS_VERSION\` |$OUTPUT_OS_VERSION_SAME_AS_FILE |$OUTPUT_OS_VERSION_SAME_AS_OS_VERSION_CONFIG |\n" >> $GITHUB_ENV
echo -n "| **firmware**<br>(os + bootloader) |\`$OUTPUT_FIRMWARE_VERSION\`|$OUTPUT_FIRMWARE_VERSION_SAME_AS_FILE|$OUTPUT_FIRMWARE_VERSION_SAME_AS_OS_VERSION_CONFIG|\n" >> $GITHUB_ENV
echo -n "| **firmware**<br>(bootloader + os) |\`$OUTPUT_FIRMWARE_VERSION\`|$OUTPUT_FIRMWARE_VERSION_SAME_AS_FILE|$OUTPUT_FIRMWARE_VERSION_SAME_AS_OS_VERSION_CONFIG|\n" >> $GITHUB_ENV


echo 'EOF_VERSION_COMPARISON_OUTPUT' >> $GITHUB_ENV
2 changes: 1 addition & 1 deletion .github/actions/compare_base_head_changes/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runs:
with:
header: compare_base_head_changes-${{ inputs.comment_header }}
message: |
# PR changes analysis report
# :chart_with_upwards_trend: Changes Impact Analysis Report
## :pushpin: Info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ echo "Creating markdown output"

echo 'FIRMWARE_STATISTICS_OUTPUT<<EOF_FIRMWARE_STATISTICS_OUTPUT' >> $GITHUB_ENV

echo -n "| Target | Flash Used (base/head) | Fash Used Δ | Flash Available (base/head) | Static RAM (base/head) | Static RAM Δ |\n" >> $GITHUB_ENV
echo -n "| Target | Flash Used (base/head) | Flash Used Δ | Flash Available (base/head) | Static RAM (base/head) | Static RAM Δ |\n" >> $GITHUB_ENV
echo -n "|--------|:----------------------:|:-----------:|:---------------------------:|:----------------------:|:------------:|\n" >> $GITHUB_ENV

echo -n "| bootloader | $OUTPUT_BOOTLOADER_FLASH_USED | $OUTPUT_BOOTLOADER_FLASH_USED_DELTA | $OUTPUT_BOOTLOADER_FLASH_AVAILABLE | $OUTPUT_BOOTLOADER_RAM | $OUTPUT_BOOTLOADER_RAM_DELTA |\n" >> $GITHUB_ENV
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/compare_base_head_changes/get_diffs.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Leka - LekaOS
# Copyright 2022 APF France handicap
# SPDX-License-Identifier: Apache-2.0

shopt -s xpg_echo

BASE_DIR=$1
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/compare_toolchain_upgrade/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Leka - LekaOS
# Copyright 2021 APF France handicap
# Copyright 2023 APF France handicap
# SPDX-License-Identifier: Apache-2.0

name: "Compare toolchain upgrade"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ fi

echo "Creating markdown output"

echo -n "| Target | Flash Used (base/head) | Fash Used Δ | Flash Available (base/head) | Static RAM (base/head) | Static RAM Δ |\n" >> $FIRMWARE_STATISTICS_OUTPUT
echo -n "| Target | Flash Used (base/head) | Flash Used Δ | Flash Available (base/head) | Static RAM (base/head) | Static RAM Δ |\n" >> $FIRMWARE_STATISTICS_OUTPUT
echo -n "|--------|:----------------------:|:-----------:|:---------------------------:|:----------------------:|:------------:|\n" >> $FIRMWARE_STATISTICS_OUTPUT

echo -n "| bootloader | $OUTPUT_BOOTLOADER_FLASH_USED | $OUTPUT_BOOTLOADER_FLASH_USED_DELTA | $OUTPUT_BOOTLOADER_FLASH_AVAILABLE | $OUTPUT_BOOTLOADER_RAM | $OUTPUT_BOOTLOADER_RAM_DELTA |\n" >> $FIRMWARE_STATISTICS_OUTPUT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

sticky_message = <<-EOF
# Toolchain upgrade analysis report
# :toolbox: Toolchain Upgrade Analysis Report
## :pushpin: Info
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/compare_toolchain_upgrade/get_diffs.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Leka - LekaOS
# Copyright 2021 APF France handicap
# SPDX-License-Identifier: Apache-2.0

shopt -s xpg_echo

BASE_DIR=$1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-code_analysis-impact_of_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
types: [opened, synchronize, reopened]
paths-ignore:
- "config/toolchain_gcc_arm_none_eabi_url"
- ".github/workflows/ci-code_analysis-toolchain_upgrade.yml"
- ".github/actions/compare_toolchain_upgrade/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-code_analysis-toolchain_upgrade.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Leka - LekaOS
# Copyright 2022 APF France handicap
# Copyright 2023 APF France handicap
# SPDX-License-Identifier: Apache-2.0

name: Code Analysis - Toolchain upgrade
Expand Down

0 comments on commit c00770c

Please sign in to comment.