From 152c6c0fef210546bb5fd49a0dead8cebbb1a1a3 Mon Sep 17 00:00:00 2001 From: Jonathan Hyry Date: Tue, 3 Jun 2025 02:23:55 -0700 Subject: [PATCH 1/5] Add the script for updating the submodules when a new Boost release drops --- 3rdparty/boost-update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 3rdparty/boost-update.sh diff --git a/3rdparty/boost-update.sh b/3rdparty/boost-update.sh new file mode 100644 index 0000000..f658b82 --- /dev/null +++ b/3rdparty/boost-update.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +NEW_BOOST_VERSION="$1" +CURRENT_BOOST_COMMIT_SHA="$(git rev-parse HEAD)" + +git checkout "boost-$NEW_BOOST_VERSION" +git cherry-pick "$CURRENT_BOOST_COMMIT_SHA" +git commit -am "Apply CMake changes to enable project usage as git submodule directly." +git tag -s "boost-$NEW_BOOST_VERSION-cmake-git-submodule" --file=../cmake-git-submodule.tag.msg +git push --tags From d6ea0e6e010d581a88ba7a58ed80c8f03826fe38 Mon Sep 17 00:00:00 2001 From: Jonathan Hyry <3676933+eljonny@users.noreply.github.com> Date: Tue, 3 Jun 2025 12:00:28 -0700 Subject: [PATCH 2/5] Create shellcheck.yml For scanning any repo scripts --- .github/workflows/shellcheck.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/shellcheck.yml diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml new file mode 100644 index 0000000..b054561 --- /dev/null +++ b/.github/workflows/shellcheck.yml @@ -0,0 +1,18 @@ +name: "TestCPP Shellcheck" + +on: + push: + branches: + - main + pull_request: + +jobs: + shellcheck: + name: Shellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Run ShellCheck + uses: ludeeus/action-shellcheck@main + with: + ignore_names: llvm.sh # External file \ No newline at end of file From 3f5e194647e01954e8aaa5b4c3e7b1c23cf0b017 Mon Sep 17 00:00:00 2001 From: Jonathan Hyry <3676933+eljonny@users.noreply.github.com> Date: Tue, 3 Jun 2025 12:02:12 -0700 Subject: [PATCH 3/5] Update shellcheck.yml Add PR branches --- .github/workflows/shellcheck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index b054561..b53d1e7 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -2,9 +2,9 @@ name: "TestCPP Shellcheck" on: push: - branches: - - main + branches: [ "main" ] pull_request: + branches: [ "main" ] jobs: shellcheck: From d410abb7aeed3a6aec62b4e7e47b43a6bdd2b811 Mon Sep 17 00:00:00 2001 From: Jonathan Hyry <3676933+eljonny@users.noreply.github.com> Date: Tue, 3 Jun 2025 12:57:43 -0700 Subject: [PATCH 4/5] Update shellcheck.yml Fix branch --- .github/workflows/shellcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index b53d1e7..98c6fe6 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -13,6 +13,6 @@ jobs: steps: - uses: actions/checkout@v3 - name: Run ShellCheck - uses: ludeeus/action-shellcheck@main + uses: ludeeus/action-shellcheck@master with: ignore_names: llvm.sh # External file \ No newline at end of file From 3ae0d8969889b6c0fc0ef54cb6729299763065f1 Mon Sep 17 00:00:00 2001 From: Jonathan Hyry Date: Tue, 3 Jun 2025 13:13:14 -0700 Subject: [PATCH 5/5] Fix shellcheck warnings Bash files should be LF, not CRLF. --- 3rdparty/boost-update.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/3rdparty/boost-update.sh b/3rdparty/boost-update.sh index f658b82..615a5b6 100644 --- a/3rdparty/boost-update.sh +++ b/3rdparty/boost-update.sh @@ -1,10 +1,10 @@ -#!/bin/bash - -NEW_BOOST_VERSION="$1" -CURRENT_BOOST_COMMIT_SHA="$(git rev-parse HEAD)" - -git checkout "boost-$NEW_BOOST_VERSION" -git cherry-pick "$CURRENT_BOOST_COMMIT_SHA" -git commit -am "Apply CMake changes to enable project usage as git submodule directly." -git tag -s "boost-$NEW_BOOST_VERSION-cmake-git-submodule" --file=../cmake-git-submodule.tag.msg -git push --tags +#!/bin/bash + +NEW_BOOST_VERSION="$1" +CURRENT_BOOST_COMMIT_SHA="$(git rev-parse HEAD)" + +git checkout "boost-$NEW_BOOST_VERSION" +git cherry-pick "$CURRENT_BOOST_COMMIT_SHA" +git commit -am "Apply CMake changes to enable project usage as git submodule directly." +git tag -s "boost-$NEW_BOOST_VERSION-cmake-git-submodule" --file=../cmake-git-submodule.tag.msg +git push --tags