diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 989cb2f1..02770c1f 100755 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -69,17 +69,66 @@ 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 }}-linux - path: build/OmniView + 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 }}-windows - path: build/Release/OmniView.exe + path: | + build/Release/OmniView.exe + config/config.json + languages/Deutsch.json + 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@v4 + with: + merge-multiple: true + + - name: display name of downloaded-artifacts + 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.zip + 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.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 + config/config.json + languages/Deutsch.json + ${{github.event.repository.name}}-${{ github.ref_name }}-ubuntu.zip + ${{github.event.repository.name}}-${{ github.ref_name }}-windows.zip diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 1fb7f165..00000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,113 +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: 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 - 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: Upload Release Assets (Windows) - uses: actions/upload-release-asset@v1 - 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 - 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(