From 086f41762474dc75e73259be592a4d1ecc914049 Mon Sep 17 00:00:00 2001 From: James Packer Date: Tue, 18 Feb 2025 08:37:31 +0000 Subject: [PATCH 1/5] Test to add version to appimage files --- .github/workflows/bridgecommandAppImageBuild.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bridgecommandAppImageBuild.yml b/.github/workflows/bridgecommandAppImageBuild.yml index 9270c83..850c9ed 100644 --- a/.github/workflows/bridgecommandAppImageBuild.yml +++ b/.github/workflows/bridgecommandAppImageBuild.yml @@ -54,6 +54,10 @@ jobs: cd bc/bin cmake ../src + - name: Find version + run : | + echo "BC_VERSION=$(./bridgecommand --version)" >> $GITHUB_ENV + - name: Build # Build your program with the given configuration run: | @@ -87,17 +91,18 @@ jobs: # 3. create our AppImage file #run linuxdeploy and fix up generate an AppDir (add lib) and build AppImage ARCH=${{ matrix.ARCH }} ./linuxdeploy.AppImage -v 1 --appdir AppDir --deploy-deps-only=$AppDir/usr/bin --output appimage - chmod 777 Bridge_Command-${{ matrix.ARCH }}.AppImage + mv Bridge_Command-${{ matrix.ARCH }}.AppImage Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage + chmod 777 Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: Bridge_Command-${{ matrix.ARCH }}.AppImage - path: Bridge_Command-${{ matrix.ARCH }}.AppImage + name: Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage + path: Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage - name: upload binaries to release uses: softprops/action-gh-release@v2 #if: ${{startsWith(github.ref, 'refs/tags/') }} with: tag_name: "Download" - files: Bridge_Command-${{ matrix.ARCH }}.AppImage + files: Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage From 854e0a9abec86d3fc49ea3aec59a02581999c5dd Mon Sep 17 00:00:00 2001 From: James Packer Date: Tue, 18 Feb 2025 08:40:57 +0000 Subject: [PATCH 2/5] Try to fix env variable access --- .github/workflows/bridgecommandAppImageBuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bridgecommandAppImageBuild.yml b/.github/workflows/bridgecommandAppImageBuild.yml index 850c9ed..7945e7b 100644 --- a/.github/workflows/bridgecommandAppImageBuild.yml +++ b/.github/workflows/bridgecommandAppImageBuild.yml @@ -92,17 +92,17 @@ jobs: #run linuxdeploy and fix up generate an AppDir (add lib) and build AppImage ARCH=${{ matrix.ARCH }} ./linuxdeploy.AppImage -v 1 --appdir AppDir --deploy-deps-only=$AppDir/usr/bin --output appimage mv Bridge_Command-${{ matrix.ARCH }}.AppImage Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage - chmod 777 Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage + chmod 777 Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage - path: Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage + name: Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage + path: Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage - name: upload binaries to release uses: softprops/action-gh-release@v2 #if: ${{startsWith(github.ref, 'refs/tags/') }} with: tag_name: "Download" - files: Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage + files: Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage From e0f64957a59346f4aa5cd320a4d4ef5c328bf4d4 Mon Sep 17 00:00:00 2001 From: James Packer Date: Tue, 18 Feb 2025 08:44:20 +0000 Subject: [PATCH 3/5] Try to fix env variable access --- .github/workflows/bridgecommandAppImageBuild.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bridgecommandAppImageBuild.yml b/.github/workflows/bridgecommandAppImageBuild.yml index 7945e7b..9c187a5 100644 --- a/.github/workflows/bridgecommandAppImageBuild.yml +++ b/.github/workflows/bridgecommandAppImageBuild.yml @@ -55,8 +55,7 @@ jobs: cmake ../src - name: Find version - run : | - echo "BC_VERSION=$(./bridgecommand --version)" >> $GITHUB_ENV + run : echo "bc_version"=$(./bridgecommand --version)" >> $GITHUB_ENV - name: Build # Build your program with the given configuration @@ -91,18 +90,18 @@ jobs: # 3. create our AppImage file #run linuxdeploy and fix up generate an AppDir (add lib) and build AppImage ARCH=${{ matrix.ARCH }} ./linuxdeploy.AppImage -v 1 --appdir AppDir --deploy-deps-only=$AppDir/usr/bin --output appimage - mv Bridge_Command-${{ matrix.ARCH }}.AppImage Bridge_Command-${{ BC_VERSION }}-${{ matrix.ARCH }}.AppImage - chmod 777 Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage + mv Bridge_Command-${{ matrix.ARCH }}.AppImage Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage + chmod 777 Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage - path: Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage + name: Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage + path: Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage - name: upload binaries to release uses: softprops/action-gh-release@v2 #if: ${{startsWith(github.ref, 'refs/tags/') }} with: tag_name: "Download" - files: Bridge_Command-${{ env.BC_VERSION }}-${{ matrix.ARCH }}.AppImage + files: Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage From 3b62e3c6bfbfb50e659275dd1b21f5840c1ea618 Mon Sep 17 00:00:00 2001 From: James Packer Date: Tue, 18 Feb 2025 08:47:51 +0000 Subject: [PATCH 4/5] Fix typo --- .github/workflows/bridgecommandAppImageBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bridgecommandAppImageBuild.yml b/.github/workflows/bridgecommandAppImageBuild.yml index 9c187a5..d2a61c1 100644 --- a/.github/workflows/bridgecommandAppImageBuild.yml +++ b/.github/workflows/bridgecommandAppImageBuild.yml @@ -55,7 +55,7 @@ jobs: cmake ../src - name: Find version - run : echo "bc_version"=$(./bridgecommand --version)" >> $GITHUB_ENV + run : echo "bc_version=$(./bridgecommand --version)" >> $GITHUB_ENV - name: Build # Build your program with the given configuration From 4489e74e97607dc34f938f7a2946b6bee9ecb846 Mon Sep 17 00:00:00 2001 From: James Packer Date: Tue, 18 Feb 2025 08:55:22 +0000 Subject: [PATCH 5/5] Check version when bc has been built, not before --- .github/workflows/bridgecommandAppImageBuild.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bridgecommandAppImageBuild.yml b/.github/workflows/bridgecommandAppImageBuild.yml index d2a61c1..b1873c3 100644 --- a/.github/workflows/bridgecommandAppImageBuild.yml +++ b/.github/workflows/bridgecommandAppImageBuild.yml @@ -54,9 +54,6 @@ jobs: cd bc/bin cmake ../src - - name: Find version - run : echo "bc_version=$(./bridgecommand --version)" >> $GITHUB_ENV - - name: Build # Build your program with the given configuration run: | @@ -90,9 +87,16 @@ jobs: # 3. create our AppImage file #run linuxdeploy and fix up generate an AppDir (add lib) and build AppImage ARCH=${{ matrix.ARCH }} ./linuxdeploy.AppImage -v 1 --appdir AppDir --deploy-deps-only=$AppDir/usr/bin --output appimage - mv Bridge_Command-${{ matrix.ARCH }}.AppImage Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage - chmod 777 Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage + chmod 777 Bridge_Command-${{ matrix.ARCH }}.AppImage + - name: Find version + run : | + cd bc/bin + echo "bc_version=$(./bridgecommand --version)" >> $GITHUB_ENV + + - name: Rename for version + run : mv Bridge_Command-${{ matrix.ARCH }}.AppImage Bridge_Command-${{ env.bc_version }}-${{ matrix.ARCH }}.AppImage + - name: Upload Artifacts uses: actions/upload-artifact@v4 with: