From 0770f416aa274b825ef799fc75d44950875e73b1 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:28:04 +0200 Subject: [PATCH 01/57] Create cmake-multi-platform.yml --- .github/workflows/cmake-multi-platform.yml | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .github/workflows/cmake-multi-platform.yml diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml new file mode 100644 index 0000000..e995f98 --- /dev/null +++ b/.github/workflows/cmake-multi-platform.yml @@ -0,0 +1,75 @@ +# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml +name: CMake on multiple platforms + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. + fail-fast: false + + # Set up a matrix to run the following 3 configurations: + # 1. + # 2. + # 3. + # + # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. + matrix: + os: [ubuntu-latest, windows-latest] + build_type: [Release] + c_compiler: [gcc, clang, cl] + include: + - os: windows-latest + c_compiler: cl + cpp_compiler: cl + - os: ubuntu-latest + c_compiler: gcc + cpp_compiler: g++ + - os: ubuntu-latest + c_compiler: clang + cpp_compiler: clang++ + exclude: + - os: windows-latest + c_compiler: gcc + - os: windows-latest + c_compiler: clang + - os: ubuntu-latest + c_compiler: cl + + steps: + - uses: actions/checkout@v3 + + - name: Set reusable strings + # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. + id: strings + shell: bash + run: | + echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: > + cmake -B ${{ steps.strings.outputs.build-output-dir }} + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -S ${{ github.workspace }} + + - name: Build + # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + + - name: Test + working-directory: ${{ steps.strings.outputs.build-output-dir }} + # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest --build-config ${{ matrix.build_type }} From 964563f558cd06ba7aa49368535109098348ad57 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:41:45 +0200 Subject: [PATCH 02/57] Refactor CMake workflow for multi-platform support --- .github/workflows/cmake-multi-platform.yml | 100 ++++++++++----------- 1 file changed, 46 insertions(+), 54 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index e995f98..30344c9 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -1,75 +1,67 @@ -# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml -name: CMake on multiple platforms +name: C++ CI on: push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] + branches: + - ak5k-patch-1 + # tags: + # - '*' + jobs: build: runs-on: ${{ matrix.os }} strategy: - # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. - fail-fast: false - - # Set up a matrix to run the following 3 configurations: - # 1. - # 2. - # 3. - # - # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. matrix: - os: [ubuntu-latest, windows-latest] - build_type: [Release] - c_compiler: [gcc, clang, cl] - include: - - os: windows-latest - c_compiler: cl - cpp_compiler: cl - - os: ubuntu-latest - c_compiler: gcc - cpp_compiler: g++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ - exclude: - - os: windows-latest - c_compiler: gcc - - os: windows-latest - c_compiler: clang - - os: ubuntu-latest - c_compiler: cl + os: [ubuntu-latest, windows-latest, macos-latest] + cpp_compiler: [g++, clang++] + c_compiler: [gcc, clang] + build_type: [Debug, Release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - - name: Set reusable strings - # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. - id: strings - shell: bash + - name: Create Build Environment + # Some setup steps may vary depending on the operating system run: | - echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" + if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then + sudo apt-get update + sudo apt-get install -y cmake + elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then + brew install cmake + fi - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: > - cmake -B ${{ steps.strings.outputs.build-output-dir }} - -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} + # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. + run: cmake -B ${{ github.workspace }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} - name: Build - # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + # Build your program with the given configuration + run: cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - name: Test - working-directory: ${{ steps.strings.outputs.build-output-dir }} - # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + working-directory: ${{ github.workspace }} + # Execute tests defined by the CMake configuration run: ctest --build-config ${{ matrix.build_type }} + + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: my-artifact + path: ${{ github.workspace }} + + release: + needs: build + runs-on: ubuntu-latest + steps: + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + draft: true + prerelease: false \ No newline at end of file From 946e78c927c0fd518feb20065b4a9f45ca4b72d1 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:49:01 +0200 Subject: [PATCH 03/57] Add environment variables for AppVeyor CI --- .github/workflows/cmake-multi-platform.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 30344c9..3ec5c8e 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -6,7 +6,10 @@ on: - ak5k-patch-1 # tags: # - '*' - +env: + APPVEYOR: true + APPVEYOR_BUILD_NUMBER: ${{ github.run_number }} + APPVEYOR_REPO_COMMIT: ${{ github.sha }} jobs: build: @@ -15,9 +18,9 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - cpp_compiler: [g++, clang++] - c_compiler: [gcc, clang] - build_type: [Debug, Release] + # cpp_compiler: [g++, clang++] + # c_compiler: [gcc, clang] + build_type: [Release] steps: - uses: actions/checkout@v2 @@ -34,7 +37,7 @@ jobs: - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - run: cmake -B ${{ github.workspace }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} + run: cmake -B ${{ github.workspace }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} - name: Build # Build your program with the given configuration From 7dba3f07482f866e0e590ff3efc845f190c35f51 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:51:44 +0200 Subject: [PATCH 04/57] Add shell type to Create Build Environment step --- .github/workflows/cmake-multi-platform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 3ec5c8e..549cb1b 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -27,6 +27,7 @@ jobs: - name: Create Build Environment # Some setup steps may vary depending on the operating system + shell: bash run: | if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then sudo apt-get update From 31730c31d9c11dbefbe7b2fea4f6d81053395299 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:54:06 +0200 Subject: [PATCH 05/57] Update project version to latest git tag --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cf6b32..25fa298 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,10 @@ if(GIT_FOUND) ) string(REGEX REPLACE "[^0-9.]" "" GIT_LATEST_TAG ${GIT_LATEST_TAG}) # Set the project version to the latest git tag - project(${PROJECT_NAME} VERSION ${GIT_LATEST_TAG} LANGUAGES C CXX) + if(NOT "${GIT_LATEST_TAG}" STREQUAL "") + # Set the project version to the latest git tag + project(${PROJECT_NAME} VERSION ${GIT_LATEST_TAG} LANGUAGES C CXX) + endif() endif() message("Project version: ${PROJECT_VERSION}") From 7eb312d910423a480b156a0e42921a7e9a6304c5 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:56:04 +0200 Subject: [PATCH 06/57] Refactor CMakeLists.txt to set project version based on latest git tag --- CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25fa298..93eab0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,22 +2,16 @@ cmake_minimum_required(VERSION 3.15) project(reallm VERSION 0.0.0 LANGUAGES C CXX) -# Find Git find_package(Git) - -# If Git was found if(GIT_FOUND) - # Get the latest git tag execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_LATEST_TAG OUTPUT_STRIP_TRAILING_WHITESPACE ) - string(REGEX REPLACE "[^0-9.]" "" GIT_LATEST_TAG ${GIT_LATEST_TAG}) - # Set the project version to the latest git tag if(NOT "${GIT_LATEST_TAG}" STREQUAL "") - # Set the project version to the latest git tag + string(REGEX REPLACE "[^0-9.]" "" GIT_LATEST_TAG ${GIT_LATEST_TAG}) project(${PROJECT_NAME} VERSION ${GIT_LATEST_TAG} LANGUAGES C CXX) endif() endif() From d7e3679a94c7bfdcb19d2f76cfe8686cb3cb346e Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:06:35 +0200 Subject: [PATCH 07/57] Add artifact upload and download actions --- .github/workflows/cmake-multi-platform.yml | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 549cb1b..de2dc12 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -53,7 +53,12 @@ jobs: uses: actions/upload-artifact@v2 with: name: my-artifact - path: ${{ github.workspace }} + path: | + ./reaper_*.dll + ./reaper_*.exe + ./reaper_*.pkg + ./reaper_*.dylib + ./reaper_*.so release: needs: build @@ -68,4 +73,21 @@ jobs: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} draft: true - prerelease: false \ No newline at end of file + prerelease: false + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: my-artifact + path: artifacts + + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./artifacts/* + asset_name: artifact + asset_content_type: application/octet-stream \ No newline at end of file From f2c9f49e43d04fc8afbc3dbd14ce77b85f2add20 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:12:09 +0200 Subject: [PATCH 08/57] Update GitHub Actions workflow to include different OS configurations --- .github/workflows/cmake-multi-platform.yml | 31 ++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index de2dc12..5c8de6c 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -17,10 +17,17 @@ jobs: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + # os: [ubuntu-latest, windows-latest, macos-latest] # cpp_compiler: [g++, clang++] # c_compiler: [gcc, clang] build_type: [Release] + include: + - os: ubuntu-latest + my_var: value_for_ubuntu + - os: windows-latest + my_var: value_for_windows + - os: macos-latest + my_var: value_for_macos steps: - uses: actions/checkout@v2 @@ -79,15 +86,17 @@ jobs: uses: actions/download-artifact@v2 with: name: my-artifact - path: artifacts + path: ./artifacts - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./artifacts/* - asset_name: artifact - asset_content_type: application/octet-stream \ No newline at end of file + run: | + for file in ./artifacts/*; do + if [ -f "$file" ]; then + echo "Uploading $file" + curl \ + -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + -H "Content-Type: $(file -b --mime-type $file)" \ + --data-binary @"$file" \ + "${{ steps.create_release.outputs.upload_url }}?name=$(basename $file)" + fi + done \ No newline at end of file From 44e11b3b7f572f04a2595b42ccaac1ad3897a27e Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:21:48 +0200 Subject: [PATCH 09/57] asdfasdf --- .github/workflows/cmake-multi-platform.yml | 26 +++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 5c8de6c..a433803 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -17,17 +17,22 @@ jobs: strategy: matrix: - # os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] # cpp_compiler: [g++, clang++] # c_compiler: [gcc, clang] build_type: [Release] include: - os: ubuntu-latest - my_var: value_for_ubuntu + arch: x64_64 + - os: ubuntu-latest + arch: aarch64 + - os: windows-latest + arch: x64 + build_type: RelWithDebInfo - os: windows-latest - my_var: value_for_windows + arch: x86 - os: macos-latest - my_var: value_for_macos + arch: arm64;x86_64 steps: - uses: actions/checkout@v2 @@ -51,11 +56,22 @@ jobs: # Build your program with the given configuration run: cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - - name: Test + - name: CTest working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration run: ctest --build-config ${{ matrix.build_type }} + - name: CPack + working-directory: ${{ github.workspace }} + # Execute tests defined by the CMake configuration + shell: bash + run: | + if [[ "${{ matrix.os }}" == "windows-latest" ]]; then + cpack + elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then + sudo cpack + fi + - name: Upload artifact uses: actions/upload-artifact@v2 with: From 48ec4f8e82b36e13465b3f882a1e11a210927839 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:30:36 +0200 Subject: [PATCH 10/57] Add Ninja build support and update CMake configuration --- .github/workflows/cmake-multi-platform.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index a433803..4d5909f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -29,8 +29,10 @@ jobs: - os: windows-latest arch: x64 build_type: RelWithDebInfo + ninja: " -G Ninja " - os: windows-latest arch: x86 + ninja: " -G Ninja " - os: macos-latest arch: arm64;x86_64 @@ -41,16 +43,21 @@ jobs: # Some setup steps may vary depending on the operating system shell: bash run: | - if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - sudo apt-get update - sudo apt-get install -y cmake - elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then - brew install cmake - fi + # if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then + # sudo apt-get update + # sudo apt-get install -y cmake + # elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then + # brew install cmake + # fi - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - run: cmake -B ${{ github.workspace }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} + shell: bash + run: | + cmake -B ${{ github.workspace }} ${{matrix.ninja}} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -S ${{ github.workspace }} + -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}} - name: Build # Build your program with the given configuration @@ -78,6 +85,7 @@ jobs: name: my-artifact path: | ./reaper_*.dll + ./reaper_*.pdb ./reaper_*.exe ./reaper_*.pkg ./reaper_*.dylib From 630a5b6dc5f061c3b14d81e5543b5b802268194f Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:31:50 +0200 Subject: [PATCH 11/57] Fix cmake command in workflow file --- .github/workflows/cmake-multi-platform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4d5909f..bca6703 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -54,9 +54,9 @@ jobs: # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. shell: bash run: | - cmake -B ${{ github.workspace }} ${{matrix.ninja}} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} + cmake -B ${{ github.workspace }} ${{matrix.ninja}} \ + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ + -S ${{ github.workspace }} \ -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}} - name: Build From fff353410d9ce134bd5b22df086400c8e9192bdc Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:34:22 +0200 Subject: [PATCH 12/57] Refactor CMake configuration command in workflow file --- .github/workflows/cmake-multi-platform.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index bca6703..4369a9a 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -52,12 +52,7 @@ jobs: - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - shell: bash - run: | - cmake -B ${{ github.workspace }} ${{matrix.ninja}} \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ - -S ${{ github.workspace }} \ - -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}} + run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}} - name: Build # Build your program with the given configuration From f249be19b119780c5bc0c865171d236b91af3980 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:35:15 +0200 Subject: [PATCH 13/57] Fix CMake configuration command in workflow file --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4369a9a..ae0cbe5 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -52,7 +52,7 @@ jobs: - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}} + run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} - name: Build # Build your program with the given configuration From acb583899a2c8bc0e8a16a6f6d8fb5e005a724cb Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:37:39 +0200 Subject: [PATCH 14/57] Update CMake configuration for different operating systems --- .github/workflows/cmake-multi-platform.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index ae0cbe5..85bd45b 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -43,12 +43,14 @@ jobs: # Some setup steps may vary depending on the operating system shell: bash run: | - # if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - # sudo apt-get update - # sudo apt-get install -y cmake - # elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then - # brew install cmake - # fi + if [[ "${{ matrix.os }}" == "windows-latest" ]]; then + choco install ninja + elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then + # sudo apt-get update + # sudo apt-get install -y cmake ninja-build + elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then + # brew install cmake ninja + fi - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. From 27c48881f0e68e8bc3e03d461227c438b7a1bd89 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:38:46 +0200 Subject: [PATCH 15/57] Fix build dependencies for different platforms --- .github/workflows/cmake-multi-platform.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 85bd45b..0b2e9aa 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -46,9 +46,11 @@ jobs: if [[ "${{ matrix.os }}" == "windows-latest" ]]; then choco install ninja elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then + ; # sudo apt-get update # sudo apt-get install -y cmake ninja-build elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then + ; # brew install cmake ninja fi From dee61ddfd377c54fb0433c7dd3a29d8b818e9754 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:39:44 +0200 Subject: [PATCH 16/57] Fix package installation commands --- .github/workflows/cmake-multi-platform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 0b2e9aa..9f4c3bf 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -46,11 +46,11 @@ jobs: if [[ "${{ matrix.os }}" == "windows-latest" ]]; then choco install ninja elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - ; + : # sudo apt-get update # sudo apt-get install -y cmake ninja-build elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then - ; + : # brew install cmake ninja fi From 67f5cc4d1b2691ddb0d60ee94dfe13bb9cfdbd13 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:42:56 +0200 Subject: [PATCH 17/57] Update CMake configuration for multi-platform support --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 9f4c3bf..8dccfd7 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -56,7 +56,7 @@ jobs: - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} + run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - name: Build # Build your program with the given configuration From 632d0f2f84a4239717fed7099fe3694aa9660cbb Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:47:46 +0200 Subject: [PATCH 18/57] Update CMake workflow to include x64 Windows build --- .github/workflows/cmake-multi-platform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8dccfd7..8aaa882 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -72,7 +72,8 @@ jobs: # Execute tests defined by the CMake configuration shell: bash run: | - if [[ "${{ matrix.os }}" == "windows-latest" ]]; then + if [[ "${{ matrix.os }}" == "windows-latest" && + "${{ matrix.arch }}" == "x64" ]]; then cpack elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then sudo cpack From d879bd2b8e6d9beb5b2a143ce399899b429fe3bd Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:53:21 +0200 Subject: [PATCH 19/57] Add VC++ 2019 Environment setup for different architectures --- .github/workflows/cmake-multi-platform.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8aaa882..8ca6fb8 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -54,6 +54,19 @@ jobs: # brew install cmake ninja fi + - name: VC++ 2019 Environment + working-directory: ${{ github.workspace }} + # Execute tests defined by the CMake configuration + shell: cmd + run: | + if "${{ matrix.arch }}" == "x64" + then + call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + elif "${{ matrix.arch }}" == "x86" + then + call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" + fi + - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" From 245848a98a7309b96a44e0ca84e33f271fc42438 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:55:19 +0200 Subject: [PATCH 20/57] Update VC++ environment to 2022 for Windows --- .github/workflows/cmake-multi-platform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8ca6fb8..a318d23 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -54,7 +54,8 @@ jobs: # brew install cmake ninja fi - - name: VC++ 2019 Environment + - name: VC++ 2022 Environment + if: runner.os == 'Windows' working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration shell: cmd From 6eb624c25c99d5d73e09455806bdde3ce70ad422 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:58:45 +0200 Subject: [PATCH 21/57] Update CMake configuration for multi-platform testing --- .github/workflows/cmake-multi-platform.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index a318d23..36de389 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -60,13 +60,11 @@ jobs: # Execute tests defined by the CMake configuration shell: cmd run: | - if "${{ matrix.arch }}" == "x64" - then + if "%matrix.arch%"=="x64" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - elif "${{ matrix.arch }}" == "x86" - then + ) else if "%matrix.arch%"=="x86" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - fi + ) - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. From aac2779dfa97cb8ace80c63554ee8f20ed60eade Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:02:24 +0200 Subject: [PATCH 22/57] Update CMake configuration for multi-platform support --- .github/workflows/cmake-multi-platform.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 36de389..fe4c701 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -68,7 +68,12 @@ jobs: - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - run: cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" + run: | + if [[ "${{ matrix.os }}" == "windows-latest" ]]; then + cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }} + else + cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" + fi - name: Build # Build your program with the given configuration From d2bd777d06e475160b39e8102d8bcedf66d8fd9c Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:03:42 +0200 Subject: [PATCH 23/57] Update CMake configuration for multi-platform support --- .github/workflows/cmake-multi-platform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index fe4c701..e5dd873 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -68,6 +68,7 @@ jobs: - name: Configure CMake # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. + shell: bash run: | if [[ "${{ matrix.os }}" == "windows-latest" ]]; then cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }} From 5c702c7abfd13bf573fefc13bec79256c382c271 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:05:57 +0200 Subject: [PATCH 24/57] Update CMake configuration for multi-platform builds --- .github/workflows/cmake-multi-platform.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index e5dd873..70d7efa 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -58,23 +58,19 @@ jobs: if: runner.os == 'Windows' working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration - shell: cmd run: | if "%matrix.arch%"=="x64" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" ) else if "%matrix.arch%"=="x86" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" ) + cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }} - - name: Configure CMake + - name: Unix-like # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. - shell: bash + if: runner.os != 'Windows' run: | - if [[ "${{ matrix.os }}" == "windows-latest" ]]; then - cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }} - else - cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - fi + cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - name: Build # Build your program with the given configuration From caf0613aac9c8c4892f7b501b7fc1d8558b48807 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:06:31 +0200 Subject: [PATCH 25/57] Remove commented out code for package installations --- .github/workflows/cmake-multi-platform.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 70d7efa..72df837 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -47,11 +47,8 @@ jobs: choco install ninja elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then : - # sudo apt-get update - # sudo apt-get install -y cmake ninja-build elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then : - # brew install cmake ninja fi - name: VC++ 2022 Environment From 24ee2718ec5b200be7aae8c0809aaab8af0b2d05 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:08:12 +0200 Subject: [PATCH 26/57] Add shell command for Windows runner --- .github/workflows/cmake-multi-platform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 72df837..8cded5f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,6 +55,7 @@ jobs: if: runner.os == 'Windows' working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration + shell: cmd run: | if "%matrix.arch%"=="x64" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" From 2c535f5b6e80914947bc88f5a27219da29861b7e Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:11:37 +0200 Subject: [PATCH 27/57] Remove unnecessary architecture-specific commands from test execution --- .github/workflows/cmake-multi-platform.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8cded5f..3caa964 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -57,11 +57,6 @@ jobs: # Execute tests defined by the CMake configuration shell: cmd run: | - if "%matrix.arch%"=="x64" ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - ) else if "%matrix.arch%"=="x86" ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - ) cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }} - name: Unix-like From eb756917a8f6015abe576eeaa565720b7655124a Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:14:14 +0200 Subject: [PATCH 28/57] Update build script to support different architectures --- .github/workflows/cmake-multi-platform.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 3caa964..261ffbc 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,9 +55,13 @@ jobs: if: runner.os == 'Windows' working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration - shell: cmd + shell: pwsh run: | - cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }} + if ("${{ matrix.arch }}" -eq "x64") { + cmd /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat`" && cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" + } elseif ("${{ matrix.arch }}" -eq "x86") { + cmd /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat`" && cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" + } - name: Unix-like # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. From 86ccb098378fa816bdfed2fd20993fca3cfceab8 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:25:08 +0200 Subject: [PATCH 29/57] Update Windows build configuration --- .github/workflows/cmake-multi-platform.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 261ffbc..5167597 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -29,10 +29,8 @@ jobs: - os: windows-latest arch: x64 build_type: RelWithDebInfo - ninja: " -G Ninja " - - os: windows-latest - arch: x86 - ninja: " -G Ninja " + # - os: windows-latest + # arch: x86 - os: macos-latest arch: arm64;x86_64 @@ -55,13 +53,11 @@ jobs: if: runner.os == 'Windows' working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration - shell: pwsh - run: | - if ("${{ matrix.arch }}" -eq "x64") { - cmd /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat`" && cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" - } elseif ("${{ matrix.arch }}" -eq "x86") { - cmd /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat`" && cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" - } + shell: cmd + run: | + call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + cmake -B ${{ github.workspace }} -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" + - name: Unix-like # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. From fb5b11beea63c1b5f8c44978ff2a9bc475aad5ed Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:25:56 +0200 Subject: [PATCH 30/57] Update CMake configuration for Windows build --- .github/workflows/cmake-multi-platform.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 5167597..ce028df 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -53,10 +53,10 @@ jobs: if: runner.os == 'Windows' working-directory: ${{ github.workspace }} # Execute tests defined by the CMake configuration - shell: cmd - run: | - call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -B ${{ github.workspace }} -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" + shell: cmd + run: | + call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + cmake -B ${{ github.workspace }} -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" - name: Unix-like From 64cf9381a05807eb2c74526ac370a97b85d7a165 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:26:13 +0200 Subject: [PATCH 31/57] Fix CMake command in workflow file --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index ce028df..4f9f9fa 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -63,7 +63,7 @@ jobs: # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. if: runner.os != 'Windows' run: | - cmake -B ${{ github.workspace }} ${{matrix.ninja}} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" + cmake -B ${{ github.workspace }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - name: Build # Build your program with the given configuration From de747dc470d9901af134094af9bd202f952ba4de Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:31:52 +0200 Subject: [PATCH 32/57] Update CMake build commands --- .github/workflows/cmake-multi-platform.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4f9f9fa..bf8f3bb 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -56,7 +56,12 @@ jobs: shell: cmd run: | call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -B ${{ github.workspace }} -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -S ${{ github.workspace }}" + cmake -B ${{ github.workspace }} -G "Ninja" ^ + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ + -DCMAKE_C_COMPILER=cl ^ + -DCMAKE_CXX_COMPILER=cl ^ + -S ${{ github.workspace }}" + cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - name: Unix-like @@ -64,10 +69,11 @@ jobs: if: runner.os != 'Windows' run: | cmake -B ${{ github.workspace }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" + cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - - name: Build - # Build your program with the given configuration - run: cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} + # - name: Build + # # Build your program with the given configuration + # run: cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - name: CTest working-directory: ${{ github.workspace }} From 5701ecafc89366a854a11d0ec9ee246383876bf3 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:35:59 +0200 Subject: [PATCH 33/57] Update build matrix for Windows and macOS platforms --- .github/workflows/cmake-multi-platform.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index bf8f3bb..cffac55 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -29,8 +29,8 @@ jobs: - os: windows-latest arch: x64 build_type: RelWithDebInfo - # - os: windows-latest - # arch: x86 + - os: windows-latest + arch: x86 - os: macos-latest arch: arm64;x86_64 @@ -55,8 +55,10 @@ jobs: # Execute tests defined by the CMake configuration shell: cmd run: | - call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -B ${{ github.workspace }} -G "Ninja" ^ + if ${{matrix.arch}} == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" + if ${{matrix.arch}} == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" + cmake -B ${{ github.workspace }} ^ + -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ -DCMAKE_C_COMPILER=cl ^ -DCMAKE_CXX_COMPILER=cl ^ @@ -68,7 +70,10 @@ jobs: # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. if: runner.os != 'Windows' run: | - cmake -B ${{ github.workspace }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" + cmake -B ${{ github.workspace }} \ + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ + -S ${{ github.workspace }} \ + -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} # - name: Build From 6d5d4ff2ac275df370e721df15e70ce07e8f9491 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:39:28 +0200 Subject: [PATCH 34/57] Fix conditional statement in CMake workflow --- .github/workflows/cmake-multi-platform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index cffac55..8e0dd13 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,8 +55,8 @@ jobs: # Execute tests defined by the CMake configuration shell: cmd run: | - if ${{matrix.arch}} == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" - if ${{matrix.arch}} == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" + if "${{matrix.arch}}" == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" + if "${{matrix.arch}}" == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ From 531e2c2f0f7e86f671a17247068f39d2decd34f9 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:41:55 +0200 Subject: [PATCH 35/57] Update Visual Studio path in CMake workflow --- .github/workflows/cmake-multi-platform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8e0dd13..505b755 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,8 +55,8 @@ jobs: # Execute tests defined by the CMake configuration shell: cmd run: | - if "${{matrix.arch}}" == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" - if "${{matrix.arch}}" == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" + if "${{matrix.arch}}" == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + if "${{matrix.arch}}" == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ From 9421e1cd2764be6f4268cdd5239fa7eccaea0370 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:46:06 +0200 Subject: [PATCH 36/57] Update VS_PATH in CMake workflow --- .github/workflows/cmake-multi-platform.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 505b755..5ddede1 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -10,6 +10,7 @@ env: APPVEYOR: true APPVEYOR_BUILD_NUMBER: ${{ github.run_number }} APPVEYOR_REPO_COMMIT: ${{ github.sha }} + VS_PATH: "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build" jobs: build: @@ -55,8 +56,8 @@ jobs: # Execute tests defined by the CMake configuration shell: cmd run: | - if "${{matrix.arch}}" == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - if "${{matrix.arch}}" == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" + if "${{matrix.arch}}" == "x64" call "%VS_PATH%\vcvars64.bat" + if "${{matrix.arch}}" == "x86" call "%VS_PATH%\vcvars32.bat" cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ From 2b712533ccf8d9bc9a3364460afe3ec7617a5dca Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:46:40 +0200 Subject: [PATCH 37/57] Update VS_PATH in cmake-multi-platform.yml --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 5ddede1..1aec5c1 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -10,7 +10,7 @@ env: APPVEYOR: true APPVEYOR_BUILD_NUMBER: ${{ github.run_number }} APPVEYOR_REPO_COMMIT: ${{ github.sha }} - VS_PATH: "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build" + VS_PATH: "%ProgramFiles%\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build" jobs: build: From 50fe6bc38692593880c93f5ac94936f193362ef7 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:59:30 +0200 Subject: [PATCH 38/57] Refactor release workflow to download and upload artifacts --- .github/workflows/cmake-multi-platform.yml | 60 ++++++++++------------ 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 1aec5c1..878ce2a 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -110,36 +110,32 @@ jobs: ./reaper_*.dylib ./reaper_*.so - release: - needs: build - runs-on: ubuntu-latest - steps: - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - draft: true - prerelease: false + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false + + - name: Download artifact + uses: actions/download-artifact@v2 + with: + name: my-artifact + path: ./artifacts - - name: Download artifacts - uses: actions/download-artifact@v2 - with: - name: my-artifact - path: ./artifacts - - - name: Upload Release Asset - run: | - for file in ./artifacts/*; do - if [ -f "$file" ]; then - echo "Uploading $file" - curl \ - -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ - -H "Content-Type: $(file -b --mime-type $file)" \ - --data-binary @"$file" \ - "${{ steps.create_release.outputs.upload_url }}?name=$(basename $file)" - fi - done \ No newline at end of file + - name: Upload Release Assets + run: | + for file in ./artifacts/*; do + if [ -f "$file" ]; then + echo "Uploading $file" + curl \ + -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + -H "Content-Type: $(file -b --mime-type $file)" \ + --data-binary @"$file" \ + "${{ steps.create_release.outputs.upload_url }}?name=$(basename $file)" + fi + done \ No newline at end of file From 006af153e454e6e1348086edefd16944bd49a83e Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:04:16 +0200 Subject: [PATCH 39/57] Add release job to CMake multi-platform workflow --- .github/workflows/cmake-multi-platform.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 878ce2a..f833261 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -110,6 +110,16 @@ jobs: ./reaper_*.dylib ./reaper_*.so + release: + needs: build + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v2 + with: + name: my-artifact + path: ./artifacts + - name: Create Release id: create_release uses: actions/create-release@v1 @@ -121,12 +131,6 @@ jobs: draft: false prerelease: false - - name: Download artifact - uses: actions/download-artifact@v2 - with: - name: my-artifact - path: ./artifacts - - name: Upload Release Assets run: | for file in ./artifacts/*; do From 34236511dff6ffb7d10d41cd4f887221f1f60bc2 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:07:39 +0200 Subject: [PATCH 40/57] Update draft status for release creation --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index f833261..8df2ba8 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -128,7 +128,7 @@ jobs: with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} - draft: false + draft: true prerelease: false - name: Upload Release Assets From 3be91ab5e6d52fb27a36e9fb62fa136b37d7c39e Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:14:58 +0200 Subject: [PATCH 41/57] Update tag_name and release_name variables --- .github/workflows/cmake-multi-platform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8df2ba8..39ce10e 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -126,8 +126,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + tag_name: ${{ github.ref_name }} + release_name: Release ${{ github.ref_name }} draft: true prerelease: false From b83eae596eaf935537e9d751c328456f63c1998d Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:25:28 +0200 Subject: [PATCH 42/57] Fix file upload URL in release step --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 39ce10e..9763f61 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -140,6 +140,6 @@ jobs: -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ -H "Content-Type: $(file -b --mime-type $file)" \ --data-binary @"$file" \ - "${{ steps.create_release.outputs.upload_url }}?name=$(basename $file)" + "${{ steps.create_release.outputs.upload_url }}=$(basename $file)" fi done \ No newline at end of file From 2133993158790ab4718c8229de002f7f33e0424c Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:32:28 +0200 Subject: [PATCH 43/57] Update build configuration for multi-platform support --- .github/workflows/cmake-multi-platform.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 9763f61..04f5018 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -19,8 +19,6 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - # cpp_compiler: [g++, clang++] - # c_compiler: [gcc, clang] build_type: [Release] include: - os: ubuntu-latest @@ -50,10 +48,9 @@ jobs: : fi - - name: VC++ 2022 Environment + - name: Windows build if: runner.os == 'Windows' working-directory: ${{ github.workspace }} - # Execute tests defined by the CMake configuration shell: cmd run: | if "${{matrix.arch}}" == "x64" call "%VS_PATH%\vcvars64.bat" @@ -61,13 +58,11 @@ jobs: cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ - -DCMAKE_C_COMPILER=cl ^ - -DCMAKE_CXX_COMPILER=cl ^ - -S ${{ github.workspace }}" + -S ${{ github.workspace }}" cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - - name: Unix-like + - name: Unix-like build # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. if: runner.os != 'Windows' run: | @@ -77,18 +72,12 @@ jobs: -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - # - name: Build - # # Build your program with the given configuration - # run: cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} - - name: CTest working-directory: ${{ github.workspace }} - # Execute tests defined by the CMake configuration run: ctest --build-config ${{ matrix.build_type }} - name: CPack working-directory: ${{ github.workspace }} - # Execute tests defined by the CMake configuration shell: bash run: | if [[ "${{ matrix.os }}" == "windows-latest" && @@ -105,8 +94,8 @@ jobs: path: | ./reaper_*.dll ./reaper_*.pdb - ./reaper_*.exe - ./reaper_*.pkg + ./*.exe + ./*.pkg ./reaper_*.dylib ./reaper_*.so From 9a569b3caaa5308c0240035c80b0af683d96aad4 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:33:24 +0200 Subject: [PATCH 44/57] Update file paths in CMake workflow --- .github/workflows/cmake-multi-platform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 04f5018..536d00f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -94,10 +94,10 @@ jobs: path: | ./reaper_*.dll ./reaper_*.pdb - ./*.exe - ./*.pkg ./reaper_*.dylib ./reaper_*.so + ./*.exe + ./*.pkg release: needs: build @@ -116,7 +116,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token with: tag_name: ${{ github.ref_name }} - release_name: Release ${{ github.ref_name }} + release_name: ${{ github.ref_name }} draft: true prerelease: false From e60d43c2373667a4063769fd5ea757834eb23503 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:47:04 +0200 Subject: [PATCH 45/57] Update platform and architecture configurations --- .github/workflows/cmake-multi-platform.yml | 64 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 536d00f..83d8c69 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -22,16 +22,20 @@ jobs: build_type: [Release] include: - os: ubuntu-latest - arch: x64_64 + arch: x86_64 - os: ubuntu-latest arch: aarch64 - - os: windows-latest - arch: x64 - build_type: RelWithDebInfo - - os: windows-latest - arch: x86 - - os: macos-latest - arch: arm64;x86_64 + - os: ubuntu-latest + arch: i686 + - os: ubuntu-latest + arch: armv7l + # - os: windows-latest + # arch: x64 + # build_type: RelWithDebInfo + # - os: windows-latest + # arch: x86 + # - os: macos-latest + # arch: arm64;x86_64 steps: - uses: actions/checkout@v2 @@ -40,12 +44,48 @@ jobs: # Some setup steps may vary depending on the operating system shell: bash run: | - if [[ "${{ matrix.os }}" == "windows-latest" ]]; then + if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then + ARCH=${{ matrix.arch }} + sudo sed -i '/arch=/! s/^deb/deb [arch=amd64,i386]/' /etc/apt/sources.list + + install-deps() { + # sudo add-apt-repository --remove "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" + local arch="$1"; shift + local native=("$@" php-cli qemu-user-binfmt ) + local target=() + + sudo dpkg --add-architecture $arch + sudo apt-get update -qq + sudo apt-get install -qq aptitude > /dev/null + sudo aptitude install -yR ${native[@]} ${target[@]/%/:$arch} > /dev/null + } + + # sudo update-alternatives --set gcc /usr/bin/gcc-7 + + case $ARCH in + x86_64) + install-deps amd64 + ;; + i686) + install-deps i386 g++-multilib + export TOOLCHAIN=$(pwd)/cmake/linux-cross.cmake \ + TOOLCHAIN_PREFIX=i386-linux-gnu + ;; + armv7l) + install-deps armhf g++-arm-linux-gnueabihf + export TOOLCHAIN=$(pwd)/cmake/linux-cross.cmake \ + TOOLCHAIN_PREFIX=arm-linux-gnueabihf + ;; + aarch64) + install-deps arm64 g++-aarch64-linux-gnu + export TOOLCHAIN=$(pwd)/cmake/linux-cross.cmake \ + TOOLCHAIN_PREFIX=aarch64-linux-gnu + ;; + esac + elif [[ "${{ matrix.os }}" == "windows-latest" ]]; then choco install ninja - elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - : elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then - : + : fi - name: Windows build From 0a0e077cd641911e157aafcea5bb0cc320dc68e6 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:51:59 +0200 Subject: [PATCH 46/57] Update build matrix in cmake-multi-platform.yml --- .github/workflows/cmake-multi-platform.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 83d8c69..6675b3f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -18,7 +18,6 @@ jobs: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] build_type: [Release] include: - os: ubuntu-latest @@ -29,13 +28,13 @@ jobs: arch: i686 - os: ubuntu-latest arch: armv7l - # - os: windows-latest - # arch: x64 - # build_type: RelWithDebInfo - # - os: windows-latest - # arch: x86 - # - os: macos-latest - # arch: arm64;x86_64 + - os: windows-latest + arch: x64 + build_type: RelWithDebInfo + - os: windows-latest + arch: x86 + - os: macos-latest + arch: arm64;x86_64 steps: - uses: actions/checkout@v2 From ed85b8772896e5456856704ee80401efe545540e Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:54:33 +0200 Subject: [PATCH 47/57] Update build matrix in cmake-multi-platform.yml --- .github/workflows/cmake-multi-platform.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 6675b3f..5918e2a 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -18,23 +18,28 @@ jobs: strategy: matrix: - build_type: [Release] include: - os: ubuntu-latest arch: x86_64 + build_type: Release - os: ubuntu-latest arch: aarch64 + build_type: Release - os: ubuntu-latest arch: i686 + build_type: Release - os: ubuntu-latest arch: armv7l + build_type: Release - os: windows-latest arch: x64 build_type: RelWithDebInfo - os: windows-latest arch: x86 + build_type: Release - os: macos-latest arch: arm64;x86_64 + build_type: Release steps: - uses: actions/checkout@v2 From 8ac7a35cc788762460bceaf451ef81b27e5105f7 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:06:22 +0200 Subject: [PATCH 48/57] Update build configurations for multi-platform support --- .github/workflows/cmake-multi-platform.yml | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 5918e2a..4b48697 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -21,25 +21,20 @@ jobs: include: - os: ubuntu-latest arch: x86_64 - build_type: Release - os: ubuntu-latest arch: aarch64 - build_type: Release - os: ubuntu-latest arch: i686 - build_type: Release - os: ubuntu-latest arch: armv7l - build_type: Release - os: windows-latest arch: x64 - build_type: RelWithDebInfo + win_build_type: RelWithDebInfo - os: windows-latest arch: x86 - build_type: Release + win_build_type: Release - os: macos-latest arch: arm64;x86_64 - build_type: Release steps: - uses: actions/checkout@v2 @@ -101,9 +96,9 @@ jobs: if "${{matrix.arch}}" == "x86" call "%VS_PATH%\vcvars32.bat" cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^ + -DCMAKE_BUILD_TYPE=${{ matrix.win_build_type }} ^ -S ${{ github.workspace }}" - cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} + cmake --build ${{ github.workspace }} --config ${{ matrix.win_build_type }} - name: Unix-like build @@ -111,14 +106,18 @@ jobs: if: runner.os != 'Windows' run: | cmake -B ${{ github.workspace }} \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ + -DCMAKE_BUILD_TYPE=Release \ -S ${{ github.workspace }} \ -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }} + -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake + -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN + -DCMAKE_OSX_DEPLOYMENT_TARGET=$DEPLOY_TARGET + cmake --build ${{ github.workspace }} --config Release - name: CTest + if: runner.os != 'Windows' working-directory: ${{ github.workspace }} - run: ctest --build-config ${{ matrix.build_type }} + run: ctest --build-config Release - name: CPack working-directory: ${{ github.workspace }} From 5bce1caf251df643e6d3421060d29e321c74f2a5 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:07:39 +0200 Subject: [PATCH 49/57] Update MACOSX_DEPLOYMENT_TARGET to 11.0 --- .github/workflows/cmake-multi-platform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4b48697..30c609a 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -11,6 +11,7 @@ env: APPVEYOR_BUILD_NUMBER: ${{ github.run_number }} APPVEYOR_REPO_COMMIT: ${{ github.sha }} VS_PATH: "%ProgramFiles%\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build" + MACOSX_DEPLOYMENT_TARGET: 11.0 jobs: build: @@ -111,7 +112,7 @@ jobs: -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN - -DCMAKE_OSX_DEPLOYMENT_TARGET=$DEPLOY_TARGET + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET cmake --build ${{ github.workspace }} --config Release - name: CTest From 92a209f539257288a8aa267134d3b0f7df903f17 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:11:08 +0200 Subject: [PATCH 50/57] Update Unix-like build configuration --- .github/workflows/cmake-multi-platform.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 30c609a..9ce7a92 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -103,16 +103,15 @@ jobs: - name: Unix-like build - # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs. if: runner.os != 'Windows' run: | cmake -B ${{ github.workspace }} \ -DCMAKE_BUILD_TYPE=Release \ -S ${{ github.workspace }} \ -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET + #-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake cmake --build ${{ github.workspace }} --config Release - name: CTest From ac55c43d420e00d265f8f81e6d989f48e1cce270 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:12:02 +0200 Subject: [PATCH 51/57] Update CMAKE_TOOLCHAIN_FILE path --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 9ce7a92..8546cf2 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -111,7 +111,7 @@ jobs: -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET - #-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake + -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake cmake --build ${{ github.workspace }} --config Release - name: CTest From a8525fe86912f06bde01a0bd8e3276142674661f Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:13:27 +0200 Subject: [PATCH 52/57] Update CMake configuration for multi-platform builds --- .github/workflows/cmake-multi-platform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8546cf2..dcc5249 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -108,9 +108,9 @@ jobs: cmake -B ${{ github.workspace }} \ -DCMAKE_BUILD_TYPE=Release \ -S ${{ github.workspace }} \ - -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" - -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN - -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET + -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" \ + -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET \ -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake cmake --build ${{ github.workspace }} --config Release From b16e05b556b0c9c8af07bc18b988457f6a129e65 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:16:23 +0200 Subject: [PATCH 53/57] Update CMAKE_TOOLCHAIN_FILE path --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index dcc5249..633d437 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -111,7 +111,7 @@ jobs: -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" \ -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN \ -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET \ - -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake + -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake cmake --build ${{ github.workspace }} --config Release - name: CTest From 4ae3a190a4e5f5bff8c32a9adc4820976b5a311d Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:18:32 +0200 Subject: [PATCH 54/57] Add VCPKG configuration for Windows static build --- .github/workflows/cmake-multi-platform.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 633d437..af22610 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -98,7 +98,9 @@ jobs: cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.win_build_type }} ^ - -S ${{ github.workspace }}" + -S ${{ github.workspace }}" ^ + -DVCPKG_TARGET_TRIPLET=${{matrix.arch}}-windows-static ^ + -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake cmake --build ${{ github.workspace }} --config ${{ matrix.win_build_type }} From c56544f3e104c2a8ab142f7512b298776f86d040 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:25:41 +0200 Subject: [PATCH 55/57] Update platform and toolchain configurations --- .github/workflows/cmake-multi-platform.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index af22610..d94084f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -20,6 +20,8 @@ jobs: strategy: matrix: include: + - os: macos-latest + arch: arm64;x86_64 - os: ubuntu-latest arch: x86_64 - os: ubuntu-latest @@ -34,8 +36,6 @@ jobs: - os: windows-latest arch: x86 win_build_type: Release - - os: macos-latest - arch: arm64;x86_64 steps: - uses: actions/checkout@v2 @@ -100,7 +100,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ matrix.win_build_type }} ^ -S ${{ github.workspace }}" ^ -DVCPKG_TARGET_TRIPLET=${{matrix.arch}}-windows-static ^ - -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake + -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake cmake --build ${{ github.workspace }} --config ${{ matrix.win_build_type }} @@ -113,7 +113,7 @@ jobs: -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" \ -DVCPKG_TARGET_TRIPLET=arch-env -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN \ -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET \ - -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake + -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake cmake --build ${{ github.workspace }} --config Release - name: CTest From c0fb77772b6f7f0f41cfbaa40977f1295c801fd2 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:28:52 +0200 Subject: [PATCH 56/57] Fix CMake command in multi-platform workflow --- .github/workflows/cmake-multi-platform.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index d94084f..a716062 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -98,9 +98,10 @@ jobs: cmake -B ${{ github.workspace }} ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE=${{ matrix.win_build_type }} ^ - -S ${{ github.workspace }}" ^ + -S ${{ github.workspace }} ^ -DVCPKG_TARGET_TRIPLET=${{matrix.arch}}-windows-static ^ - -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake + -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake + cmake --build ${{ github.workspace }} --config ${{ matrix.win_build_type }} From 89a6ac442ae3411a0841f072cc351e9780f88bd1 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:34:56 +0200 Subject: [PATCH 57/57] Refactor code to improve performance and readability --- .github/workflows/cmake-multi-platform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index a716062..cb341c1 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -3,9 +3,9 @@ name: C++ CI on: push: branches: - - ak5k-patch-1 - # tags: - # - '*' + - main + tags: + - '*' env: APPVEYOR: true APPVEYOR_BUILD_NUMBER: ${{ github.run_number }}