diff options
| author | Derek Bailey <derekbailey@google.com> | 2021-11-30 23:12:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 23:12:57 -0800 |
| commit | 5c5475479032ad9c1b611a24b3bfbdd30fde3e38 (patch) | |
| tree | e2319826b6a963226028bafb1199d795d496f0ab | |
| parent | 4f7f6dc301f5ffb9765b055d48324dc7629abd5a (diff) | |
| download | flatbuffers-5c5475479032ad9c1b611a24b3bfbdd30fde3e38.tar.gz flatbuffers-5c5475479032ad9c1b611a24b3bfbdd30fde3e38.tar.bz2 flatbuffers-5c5475479032ad9c1b611a24b3bfbdd30fde3e38.zip | |
switched to windows-lastest, removed deadcode (#6948)
| -rw-r--r-- | .github/workflows/build.yml | 63 |
1 files changed, 21 insertions, 42 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e76107a..5ad15632 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,12 +34,12 @@ jobs: path: flatc build-windows: - name: Build Windows + name: Build Windows 2019 runs-on: windows-latest steps: - uses: actions/checkout@v1 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: cmake run: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON . - name: build @@ -54,15 +54,29 @@ jobs: build-windows-2017: name: Build Windows 2017 - runs-on: windows-2016 + runs-on: windows-latest steps: - uses: actions/checkout@v1 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: cmake - run: cmake -G "Visual Studio 15 2017" -A x64 -DCMAKE_BUILD_TYPE=Release . - - name: build - run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64 + run: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release . + - name: build tool version 15 (VS 2017) + run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64 /p:VisualStudioVersion=15.0 + - name: test + run: Release\flattests.exe + + build-windows-2015: + name: Build Windows 2015 + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.1 + - name: cmake + run: cmake -G "Visual Studio 14 2015" -A x64 -DCMAKE_BUILD_TYPE=Release . + - name: build tool version 14 (VS 2015) + run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64 /p:VisualStudioVersion=14.0 - name: test run: Release\flattests.exe @@ -201,18 +215,6 @@ jobs: working-directory: tests run: bash RustTest.sh - #build-js: - # name: Build JS - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v1 - # - name: flatc - # # FIXME: make test script not rely on flatc - # run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF . && make -j4 - # - name: test - # working-directory: tests - # run: bash JavaScriptTest.sh - build-python: name: Build Python runs-on: ubuntu-latest @@ -234,29 +236,6 @@ jobs: working-directory: tests run: bash GoTest.sh - #build-csharp: - # name: Build CSharp - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v1 - # - name: test - # working-directory: tests/FlatBuffers.Test - # run: bash NetTest.sh - - #build-php: - # name: Build PHP - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v1 - # - name: flatc - # # FIXME: make test script not rely on flatc - # run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF . && make -j4 - # - name: test - # working-directory: tests - # run: | - # php phpTest.php - # sh phpUnionVectorTest.sh - build-swift: name: Build Swift runs-on: ubuntu-latest |