From c1fba82d2ff3daf42b22b95b7da5726a220f1c41 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:15:30 +0100 Subject: [PATCH 1/4] Strip version number of inav_SITL binaries in artifacts, so it can easily be used in configurator --- .github/workflows/ci.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d7218ed860..ca5cef3a75c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,6 +130,11 @@ jobs: echo "NUM_CORES=$(grep processor /proc/cpuinfo | wc -l)" >> $GITHUB_ENV - name: Build SITL run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j${{ env.NUM_CORES }} + - name: Strip version number + run: | + for f in build_SITL/*_SITL; do + mv $f $(echo $f | sed -e 's/_[0-9]\+\.[0-9]\+\.[0-9]\+//') + done - name: Upload artifacts uses: actions/upload-artifact@v4 with: @@ -161,6 +166,11 @@ jobs: echo "NUM_CORES=$(grep processor /proc/cpuinfo | wc -l)" >> $GITHUB_ENV - name: Build SITL run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j${{ env.NUM_CORES }} + - name: Strip version number + run: | + for f in build_SITL/*_SITL; do + mv $f $(echo $f | sed -e 's/_[0-9]\+\.[0-9]\+\.[0-9]\+//') + done - name: Upload artifacts uses: actions/upload-artifact@v4 with: @@ -197,7 +207,11 @@ jobs: mkdir -p build_SITL && cd build_SITL cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -G Ninja .. ninja -j4 - + - name: Strip version number + run: | + for f in build_SITL/*_SITL; do + mv $f $(echo $f | sed -e 's/_[0-9]\+\.[0-9]\+\.[0-9]\+//') + done - name: Upload artifacts uses: actions/upload-artifact@v4 with: @@ -234,6 +248,8 @@ jobs: - name: Build SITL run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4 + - name: Strip version number + run: ren build_SITL\inav_${{VERSION}}_SITL.exe inav_SITL.exe - name: Upload artifacts uses: actions/upload-artifact@v4 with: From 58498438d374a6c58a4d4f44d222daf8cb385803 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:22:33 +0100 Subject: [PATCH 2/4] Small fixes --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca5cef3a75c..b82ef511b1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,14 +249,16 @@ jobs: - name: Build SITL run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4 - name: Strip version number - run: ren build_SITL\inav_${{VERSION}}_SITL.exe inav_SITL.exe + run: | + for f in build_SITL/*_SITL; do + mv $f $(echo $f | sed -e 's/_[0-9]\+\.[0-9]\+\.[0-9]\+//') + done - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }}_SITL-WIN path: ./build_SITL/*.exe - test: #needs: [build] runs-on: ubuntu-latest From f285550cda3b3ed75631b994c6de39aefcc6746c Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:28:21 +0100 Subject: [PATCH 3/4] small changes to windows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b82ef511b1e..5559e3697d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,7 +250,7 @@ jobs: run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4 - name: Strip version number run: | - for f in build_SITL/*_SITL; do + for f in ./build_SITL/*_SITL; do mv $f $(echo $f | sed -e 's/_[0-9]\+\.[0-9]\+\.[0-9]\+//') done - name: Upload artifacts From f74275ded44ad287b4118ed3a9b3a6ff8ccb204c Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:32:31 +0100 Subject: [PATCH 4/4] was missing .exe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5559e3697d3..3b5576b704a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,7 +250,7 @@ jobs: run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4 - name: Strip version number run: | - for f in ./build_SITL/*_SITL; do + for f in ./build_SITL/*_SITL.exe; do mv $f $(echo $f | sed -e 's/_[0-9]\+\.[0-9]\+\.[0-9]\+//') done - name: Upload artifacts