From 5027bd9fa67b4a9f592baeadb51627d3866415cc Mon Sep 17 00:00:00 2001 From: KK-Simon Date: Fri, 1 Dec 2023 16:10:46 +0000 Subject: [PATCH] remove submodule --- .github/workflows/cmake-windows.yml | 2 +- .github/workflows/release-build.yml | 72 ----------------------------- .gitmodules | 3 -- 3 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 .github/workflows/release-build.yml diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 49b8606..9ad3025 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -20,7 +20,7 @@ jobs: with: vcpkgArguments: 'zlib discord-rpc nlohmann-json openssl minhook' vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273' + vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4' vcpkgTriplet: 'x64-windows-static' - name: Create Build Environment diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml deleted file mode 100644 index 181d90c..0000000 --- a/.github/workflows/release-build.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Release Create & Build -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 - -env: - BUILD_TYPE: Release - -jobs: - create-release: - runs-on: ubuntu-latest - name: Create Release - outputs: - upload_url: ${{ steps.create_release.outputs.upload_url }} - steps: - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false - body: | - Files included in this release: - - `BeamMP-Launcher.exe` windows build - - upload-release-files-windows: - name: Upload Windows Release Files - runs-on: windows-latest - needs: create-release - steps: - - uses: actions/checkout@v2 - with: - submodules: 'recursive' - - - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@main - id: runvcpkg - with: - vcpkgArguments: 'zlib discord-rpc nlohmann-json openssl minhook' - vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273' - vcpkgTriplet: 'x64-windows-static' - - - name: Create Build Environment - run: cmake -E make_directory ${{github.workspace}}/build-windows - - - name: Configure CMake - shell: bash - working-directory: ${{github.workspace}}/build-windows - run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static - - - name: Build - working-directory: ${{github.workspace}}/build-windows - shell: bash - run: cmake --build . --config $BUILD_TYPE --target BeamMP-Launcher - - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Launcher.exe - asset_name: BeamMP-Launcher.exe - asset_content_type: application/vnd.microsoft.portable-executable diff --git a/.gitmodules b/.gitmodules index 49407e2..1e1813f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "wxWidgets"] path = include/wxWidgets url = https://github.com/wxWidgets/wxWidgets.git -[submodule "include/cpp-httplib"] - path = include/cpp-httplib - url = https://github.com/yhirose/cpp-httplib.git [submodule "include/tomlplusplus"] path = include/tomlplusplus url = https://github.com/marzer/tomlplusplus.git