From b467de43b6b691367aed807f1f75c24aeb1c9470 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 14:14:21 +0200 Subject: [PATCH 01/12] Update release with artifacts etc --- .github/workflows/release.yaml | 65 ++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1fb7f165..9b0bead6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,7 @@ name: Make Release on: push: tags: - - '*' + - '*' jobs: build: @@ -85,29 +85,48 @@ jobs: name: executable-windows path: build/Release/OmniView.exe - - name: Create Release - id: create_release - uses: softprops/action-gh-release@v1 - with: - files: | - build/OmniView - build/Release/OmniView.exe - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Upload Release Assets - uses: actions/upload-release-asset@v1 + - name: upload assets + uses: actions/upload-artifact@v3 + if: ${{ contains(matrix.os, 'windows' ) }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: build/OmniView - asset_name: OmniView_Ubuntu_x64 - asset_content_type: application/octet-stream + name: assets + path: | + config/config.json + languages/Deutsch.json - - name: Upload Release Assets (Windows) - uses: actions/upload-release-asset@v1 + - name: download firmware + uses: actions/download-artifact@v3 with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: build/Release/OmniView.exe - asset_name: OmniView_Windows_x64.exe - asset_content_type: application/octet-stream + name: | + executable-linux + executable-windows + assets + - name: zip release files (Ubuntu) + uses: montudor/action-zip@v1 + if: ${{ !contains(matrix.os, 'windows' ) }} + with: + args: | + zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-ubuntu.zip + build/OmniView + config/config.json + languages/Deutsch.json + + - name: zip release files (Windows) + uses: montudor/action-zip@v1 + if: ${{ contains(matrix.os, 'windows' ) }} + with: + args: | + zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip + build/Release/OmniView.exe + config/config.json + languages/Deutsch.json + + - name: create release + uses: ncipollo/release-action@v1 + with: + artifacts: | + build/Release/OmniView.exe + build/OmniView + ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip + ${{env.REPO_NAME}}-${{ github.ref_name }}-ubuntu.zip From 40aa3b6ce9391498ae3f36b41f9db3681fc0116a Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 14:38:41 +0200 Subject: [PATCH 02/12] Update release with artifacts etc --- .github/workflows/build.yaml | 75 ++++++++++++++++++- .github/workflows/release.yaml | 132 --------------------------------- 2 files changed, 73 insertions(+), 134 deletions(-) delete mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 989cb2f1..4c8a361d 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -73,13 +73,84 @@ jobs: if: ${{ !contains(matrix.os, 'windows' ) }} with: name: ${{ github.event.repository.name }}-linux - path: build/OmniView + path: | + build/OmniView + config/config.json + languages/Deutsch.json - name: upload executable (Windows) uses: actions/upload-artifact@v3 if: ${{ contains(matrix.os, 'windows' ) }} with: name: ${{ github.event.repository.name }}-windows - path: build/Release/OmniView.exe + path: | + build/Release/OmniView.exe + config/config.json + languages/Deutsch.json + release: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - os: windows-latest + triplet: x64-windows + - os: ubuntu-latest + triplet: x64-linux + + needs: build + if: startsWith(github.ref, 'refs/tags/v') + + steps: + - name: checkout repo + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: download windows files + uses: actions/download-artifact@v3 + if: ${{ !contains(matrix.os, 'windows' ) }} + with: + name: | + executable-linux + executable-windows + assets + + - name: download windows files + uses: actions/download-artifact@v3 + if: ${{ !contains(matrix.os, 'windows' ) }} + with: + name: | + ${{ github.event.repository.name }}-windows + ${{ github.event.repository.name }}-linux + - name: zip release files (Ubuntu) + uses: montudor/action-zip@v1 + if: ${{ !contains(matrix.os, 'windows' ) }} + with: + args: | + zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip + ${{ github.event.repository.name }}-linux + + - name: zip release files (Windows) + uses: montudor/action-zip@v1 + if: ${{ contains(matrix.os, 'windows' ) }} + with: + args: | + zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip + ${{ github.event.repository.name }}-windows + + - name: create release + uses: ncipollo/release-action@v1 + if: ${{ !contains(matrix.os, 'windows' ) }} + with: + artifacts: | + ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip + + - name: create release + uses: ncipollo/release-action@v1 + if: ${{ contains(matrix.os, 'windows' ) }} + with: + artifacts: | + ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 9b0bead6..00000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,132 +0,0 @@ -name: Make Release - -on: - push: - tags: - - '*' - -jobs: - build: - name: ${{ matrix.os }}-${{ github.workflow }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - include: - - os: windows-latest - triplet: x64-windows - - os: ubuntu-latest - triplet: x64-linux - - steps: - - uses: actions/checkout@v3 - - - name: add ssh private keys for submodule repositories - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.SSH_KEY_SUBMODULE_AI_OMNISCOPE_V2 }} - - - name: checkout submodules - run: git submodule update --init --recursive - - - name: setup - uses: aminya/setup-cpp@v1 - with: - compiler: ${{ matrix.compiler }} - vcvarsall: ${{ contains(matrix.os, 'windows' )}} - cmake: true - - - name: install deps - uses: awalsh128/cache-apt-pkgs-action@latest - if: ${{ !contains(matrix.os, 'windows' ) }} - with: - packages: libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev pkg-config - version: 1.0 - - - name: setup prerequisites - if: ${{ !contains(matrix.os, 'windows' ) }} - shell: bash - run: | - sudo apt update - sudo apt install autoconf libudev-dev - - # On Windows runners, let's ensure to have the Developer Command Prompt environment setup correctly. - # As used here the Developer Command Prompt created is targeting x64 and using the default the Windows SDK. - - uses: ilammy/msvc-dev-cmd@v1 - - - name: CMake configure - if: ${{ !contains(matrix.os, 'windows' ) }} - run: cmake -S . -B ./build -DCMAKE_BUILD_TYPE="Release" - - - name: build - if: ${{ !contains(matrix.os, 'windows' ) }} - run: cmake --build ./build - - - name: CMake configure - if: ${{ contains(matrix.os, 'windows' ) }} - run: cmake -S . -B ./build -DVCPKG_TARGET_TRIPLET="x64-windows-static" - - - name: build - if: ${{ contains(matrix.os, 'windows' ) }} - run: cmake --build ./build --config Release - - - name: upload executable (Linux) - uses: actions/upload-artifact@v3 - if: ${{ !contains(matrix.os, 'windows' ) }} - with: - name: executable-linux - path: build/OmniView - - - name: upload executable (Windows) - uses: actions/upload-artifact@v3 - if: ${{ contains(matrix.os, 'windows' ) }} - with: - name: executable-windows - path: build/Release/OmniView.exe - - - name: upload assets - uses: actions/upload-artifact@v3 - if: ${{ contains(matrix.os, 'windows' ) }} - with: - name: assets - path: | - config/config.json - languages/Deutsch.json - - - name: download firmware - uses: actions/download-artifact@v3 - with: - name: | - executable-linux - executable-windows - assets - - - name: zip release files (Ubuntu) - uses: montudor/action-zip@v1 - if: ${{ !contains(matrix.os, 'windows' ) }} - with: - args: | - zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-ubuntu.zip - build/OmniView - config/config.json - languages/Deutsch.json - - - name: zip release files (Windows) - uses: montudor/action-zip@v1 - if: ${{ contains(matrix.os, 'windows' ) }} - with: - args: | - zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip - build/Release/OmniView.exe - config/config.json - languages/Deutsch.json - - - name: create release - uses: ncipollo/release-action@v1 - with: - artifacts: | - build/Release/OmniView.exe - build/OmniView - ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip - ${{env.REPO_NAME}}-${{ github.ref_name }}-ubuntu.zip From 294cf94550455af8cf53c45e4ed6af22e51d447b Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 14:40:52 +0200 Subject: [PATCH 03/12] Update release with artifacts etc --- .github/workflows/build.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4c8a361d..cb73c2f0 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,14 +90,6 @@ jobs: release: runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - include: - - os: windows-latest - triplet: x64-windows - - os: ubuntu-latest - triplet: x64-linux needs: build if: startsWith(github.ref, 'refs/tags/v') From f0a20a97643a13598d1a80ee646b0f10a85247c0 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 14:56:58 +0200 Subject: [PATCH 04/12] Update release with artifacts etc --- .github/workflows/build.yaml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cb73c2f0..d6730cee 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,7 +89,7 @@ jobs: languages/Deutsch.json release: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest needs: build if: startsWith(github.ref, 'refs/tags/v') @@ -100,18 +100,8 @@ jobs: with: fetch-depth: 0 - - name: download windows files - uses: actions/download-artifact@v3 - if: ${{ !contains(matrix.os, 'windows' ) }} - with: - name: | - executable-linux - executable-windows - assets - - - name: download windows files + - name: download files uses: actions/download-artifact@v3 - if: ${{ !contains(matrix.os, 'windows' ) }} with: name: | ${{ github.event.repository.name }}-windows @@ -119,30 +109,30 @@ jobs: - name: zip release files (Ubuntu) uses: montudor/action-zip@v1 - if: ${{ !contains(matrix.os, 'windows' ) }} with: args: | zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip - ${{ github.event.repository.name }}-linux + build/OmniView + config/config.json + languages/Deutsch.json - name: zip release files (Windows) uses: montudor/action-zip@v1 - if: ${{ contains(matrix.os, 'windows' ) }} with: args: | zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip - ${{ github.event.repository.name }}-windows + build/Release/OmniView.exe + config/config.json + languages/Deutsch.json - - name: create release + - name: create release (Ubunut) uses: ncipollo/release-action@v1 - if: ${{ !contains(matrix.os, 'windows' ) }} with: artifacts: | ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip - - name: create release + - name: create release (Windows) uses: ncipollo/release-action@v1 - if: ${{ contains(matrix.os, 'windows' ) }} with: artifacts: | ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip From 08980cd44977b33a26fb0d5a173e8831930a83c7 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 15:22:27 +0200 Subject: [PATCH 05/12] Update release with artifacts etc --- .github/workflows/build.yaml | 44 +++++++++++++++--------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d6730cee..c051dd9c 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -72,7 +72,7 @@ jobs: uses: actions/upload-artifact@v3 if: ${{ !contains(matrix.os, 'windows' ) }} with: - name: ${{ github.event.repository.name }}-linux + name: ${{ github.event.repository.name }}-${{ matrix.runs-on }} path: | build/OmniView config/config.json @@ -82,7 +82,7 @@ jobs: uses: actions/upload-artifact@v3 if: ${{ contains(matrix.os, 'windows' ) }} with: - name: ${{ github.event.repository.name }}-windows + name: ${{ github.event.repository.name }}-${{ matrix.runs-on }} path: | build/Release/OmniView.exe config/config.json @@ -90,49 +90,41 @@ jobs: release: runs-on: ubuntu-latest - needs: build if: startsWith(github.ref, 'refs/tags/v') steps: - - name: checkout repo - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: download files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: | - ${{ github.event.repository.name }}-windows - ${{ github.event.repository.name }}-linux + path: ${{env.REPO_NAME}}-${{ github.ref_name }} + merge-multiple: true + + - name: display name of downloaded-artifacts + run: ls -R ${{env.REPO_NAME}}-${{ github.ref_name }} - name: zip release files (Ubuntu) uses: montudor/action-zip@v1 with: - args: | - zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip - build/OmniView - config/config.json - languages/Deutsch.json + args: zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-ubuntu-latest.zip + ${{env.REPO_NAME}}-${{ github.ref_name }}/build/OmniView + ${{env.REPO_NAME}}-${{ github.ref_name }}/config/config.json + ${{env.REPO_NAME}}-${{ github.ref_name }}/languages/Deutsch.json - name: zip release files (Windows) uses: montudor/action-zip@v1 with: - args: | - zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip - build/Release/OmniView.exe - config/config.json - languages/Deutsch.json + args: zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows-latest.zip + ${{env.REPO_NAME}}-${{ github.ref_name }}/build/OmniView.exe + ${{env.REPO_NAME}}-${{ github.ref_name }}/config/config.json + ${{env.REPO_NAME}}-${{ github.ref_name }}/languages/Deutsch.json - name: create release (Ubunut) uses: ncipollo/release-action@v1 with: - artifacts: | - ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip + artifacts: ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip - name: create release (Windows) uses: ncipollo/release-action@v1 with: - artifacts: | - ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip + artifacts: ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip From 9e00a5052a627c446e1c5a294061a2424623b248 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 15:34:35 +0200 Subject: [PATCH 06/12] Update release with artifacts etc --- .github/workflows/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c051dd9c..53844086 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -97,16 +97,16 @@ jobs: - name: download files uses: actions/download-artifact@v4 with: - path: ${{env.REPO_NAME}}-${{ github.ref_name }} + path: ${{ github.event.repository.name }}-${{ github.ref_name }} merge-multiple: true - name: display name of downloaded-artifacts - run: ls -R ${{env.REPO_NAME}}-${{ github.ref_name }} + run: ls -R ${{github.event.repository.name}}-${{ github.ref_name }} - name: zip release files (Ubuntu) uses: montudor/action-zip@v1 with: - args: zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-ubuntu-latest.zip + args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-ubuntu-latest.zip ${{env.REPO_NAME}}-${{ github.ref_name }}/build/OmniView ${{env.REPO_NAME}}-${{ github.ref_name }}/config/config.json ${{env.REPO_NAME}}-${{ github.ref_name }}/languages/Deutsch.json @@ -114,7 +114,7 @@ jobs: - name: zip release files (Windows) uses: montudor/action-zip@v1 with: - args: zip -qq -r ${{env.REPO_NAME}}-${{ github.ref_name }}-windows-latest.zip + args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-windows-latest.zip ${{env.REPO_NAME}}-${{ github.ref_name }}/build/OmniView.exe ${{env.REPO_NAME}}-${{ github.ref_name }}/config/config.json ${{env.REPO_NAME}}-${{ github.ref_name }}/languages/Deutsch.json @@ -122,9 +122,9 @@ jobs: - name: create release (Ubunut) uses: ncipollo/release-action@v1 with: - artifacts: ${{env.REPO_NAME}}-${{ github.ref_name }}-linux.zip + artifacts: ${{github.event.repository.name}}-${{ github.ref_name }}-linux.zip - name: create release (Windows) uses: ncipollo/release-action@v1 with: - artifacts: ${{env.REPO_NAME}}-${{ github.ref_name }}-windows.zip + artifacts: ${{github.event.repository.name}}-${{ github.ref_name }}-windows.zip From b2a92974b4dd36667cbcb447a3572bfd485f3014 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 16:13:56 +0200 Subject: [PATCH 07/12] Update release with artifacts etc --- .github/workflows/build.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 53844086..1742f264 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -69,20 +69,20 @@ jobs: run: cmake --build ./build --config Release - name: upload executable (Linux) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ !contains(matrix.os, 'windows' ) }} with: - name: ${{ github.event.repository.name }}-${{ matrix.runs-on }} + name: ${{ github.event.repository.name }}-linux path: | build/OmniView config/config.json languages/Deutsch.json - name: upload executable (Windows) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ contains(matrix.os, 'windows' ) }} with: - name: ${{ github.event.repository.name }}-${{ matrix.runs-on }} + name: ${{ github.event.repository.name }}-windows path: | build/Release/OmniView.exe config/config.json @@ -94,10 +94,14 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') steps: + - name: checkout repo + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: download files uses: actions/download-artifact@v4 with: - path: ${{ github.event.repository.name }}-${{ github.ref_name }} merge-multiple: true - name: display name of downloaded-artifacts From 6fb5cbe9e83c5192594900a54dfa71d9df3c79d4 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 16:29:29 +0200 Subject: [PATCH 08/12] Update release with artifacts etc --- .github/workflows/build.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1742f264..c700644a 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -105,23 +105,23 @@ jobs: merge-multiple: true - name: display name of downloaded-artifacts - run: ls -R ${{github.event.repository.name}}-${{ github.ref_name }} + run: ls -R - name: zip release files (Ubuntu) uses: montudor/action-zip@v1 with: args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-ubuntu-latest.zip - ${{env.REPO_NAME}}-${{ github.ref_name }}/build/OmniView - ${{env.REPO_NAME}}-${{ github.ref_name }}/config/config.json - ${{env.REPO_NAME}}-${{ github.ref_name }}/languages/Deutsch.json + build/OmniView + config/config.json + languages/Deutsch.json - name: zip release files (Windows) uses: montudor/action-zip@v1 with: args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-windows-latest.zip - ${{env.REPO_NAME}}-${{ github.ref_name }}/build/OmniView.exe - ${{env.REPO_NAME}}-${{ github.ref_name }}/config/config.json - ${{env.REPO_NAME}}-${{ github.ref_name }}/languages/Deutsch.json + build/OmniView.exe + config/config.json + languages/Deutsch.json - name: create release (Ubunut) uses: ncipollo/release-action@v1 From 2879c8e1ad6b1b1d7664e3aabf62e6c8f10106f2 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 16:45:23 +0200 Subject: [PATCH 09/12] Update release with artifacts etc --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c700644a..19c7d08a 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -110,7 +110,7 @@ jobs: - name: zip release files (Ubuntu) uses: montudor/action-zip@v1 with: - args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-ubuntu-latest.zip + args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-ubuntu.zip build/OmniView config/config.json languages/Deutsch.json @@ -118,12 +118,12 @@ jobs: - name: zip release files (Windows) uses: montudor/action-zip@v1 with: - args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-windows-latest.zip + args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-windows.zip build/OmniView.exe config/config.json languages/Deutsch.json - - name: create release (Ubunut) + - name: create release (Ubuntu) uses: ncipollo/release-action@v1 with: artifacts: ${{github.event.repository.name}}-${{ github.ref_name }}-linux.zip From 27b1ed82f95c1af306dbf5e5773a6635aef52525 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 17:00:44 +0200 Subject: [PATCH 10/12] Update version number --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d2cb376..4ab9ff6e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_PROJECT_TOP_LEVEL_INCLUDE set(CMAKE_TOOLCHAIN_FILE "${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake") -project("OmniscopeGui" VERSION 0.5.1) +project("OmniscopeGui" VERSION 0.9.0) if(MSVC) add_compile_options( From 2e2a25a33a921cdf702b4774c1e13ca64e2277a6 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 17:01:15 +0200 Subject: [PATCH 11/12] Update github action --- .github/workflows/build.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 19c7d08a..cb6ec642 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -119,16 +119,17 @@ jobs: uses: montudor/action-zip@v1 with: args: zip -qq -r ${{github.event.repository.name}}-${{ github.ref_name }}-windows.zip - build/OmniView.exe + build/Release/OmniView.exe config/config.json languages/Deutsch.json - - name: create release (Ubuntu) + - name: create release uses: ncipollo/release-action@v1 with: - artifacts: ${{github.event.repository.name}}-${{ github.ref_name }}-linux.zip - - - name: create release (Windows) - uses: ncipollo/release-action@v1 - with: - artifacts: ${{github.event.repository.name}}-${{ github.ref_name }}-windows.zip + artifacts: | + build/OmniView.exe + build/Release/OmniView.exe + config/config.json + languages/Deutsch.json + ${{github.event.repository.name}}-${{ github.ref_name }}-ubuntu.zip + ${{github.event.repository.name}}-${{ github.ref_name }}-windows.zip From c81c9ac5bfb6cef7c226d754a6bcfa305a59306f Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 19 Apr 2024 17:10:35 +0200 Subject: [PATCH 12/12] Removed artifact from action --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cb6ec642..02770c1f 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -127,7 +127,6 @@ jobs: uses: ncipollo/release-action@v1 with: artifacts: | - build/OmniView.exe build/Release/OmniView.exe config/config.json languages/Deutsch.json