From 9ec54de96628d01a9c474d370c3d0bb4c03e2b32 Mon Sep 17 00:00:00 2001 From: le-michael Date: Wed, 20 Sep 2023 18:15:24 -0700 Subject: [PATCH 1/2] Fix nim workflow --- .github/workflows/build.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd59a243837..5c82088e71f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,8 +65,8 @@ jobs: if: matrix.cxx == 'g++-10' && startsWith(github.ref, 'refs/tags/') id: hash-gcc run: echo "hashes=$(sha256sum Linux.flatc.binary.${{ matrix.cxx }}.zip | base64 -w0)" >> $GITHUB_OUTPUT - - build-linux-no-file-tests: + + build-linux-no-file-tests: name: Build Linux with -DFLATBUFFERS_NO_FILE_TESTS runs-on: ubuntu-latest steps: @@ -76,7 +76,7 @@ jobs: - name: build run: make -j - build-linux-out-of-source: + build-linux-out-of-source: name: Build Linux with out-of-source build location runs-on: ubuntu-latest steps: @@ -114,8 +114,8 @@ jobs: - uses: actions/checkout@v3 - name: cmake run: > - CXX=${{ matrix.cxx }} cmake -G "Unix Makefiles" - -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_STRICT_MODE=ON + CXX=${{ matrix.cxx }} cmake -G "Unix Makefiles" + -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_STRICT_MODE=ON -DFLATBUFFERS_CPP_STD=${{ matrix.std }} -DFLATBUFFERS_BUILD_CPP17=${{ matrix.std >= 17 && 'On' || 'Off'}} - name: build @@ -139,8 +139,8 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: cmake run: > - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release - -DFLATBUFFERS_STRICT_MODE=ON + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release + -DFLATBUFFERS_STRICT_MODE=ON -DFLATBUFFERS_CPP_STD=${{ matrix.std }} -DFLATBUFFERS_BUILD_CPP17=${{ matrix.std >= 17 && 'On' || 'Off'}} - name: build @@ -156,7 +156,7 @@ jobs: contents: write outputs: digests: ${{ steps.hash.outputs.hashes }} - name: Build Windows 2019 + name: Build Windows 2019 runs-on: windows-2019 steps: - uses: actions/checkout@v3 @@ -225,7 +225,7 @@ jobs: matrix: configuration: [ '', - '-p:UnsafeByteBuffer=true', + '-p:UnsafeByteBuffer=true', # Fails two tests currently. #'-p:EnableSpanT=true,UnsafeByteBuffer=true' ] @@ -233,7 +233,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup .NET Core SDK uses: actions/setup-dotnet@v3 - with: + with: dotnet-version: '3.1.x' - name: Build run: | @@ -462,7 +462,7 @@ jobs: - name: test working-directory: tests run: bash RustTest.sh - + build-rust-windows: name: Build Rust Windows runs-on: windows-2019 @@ -579,6 +579,7 @@ jobs: - name: install library working-directory: nim run: nimble -y develop + run: nimble install - name: test working-directory: tests/nim run: python3 testnim.py From e83e65c27ad6a1a67bfb2b2546bf3d8a133a89e4 Mon Sep 17 00:00:00 2001 From: le-michael Date: Wed, 20 Sep 2023 18:22:49 -0700 Subject: [PATCH 2/2] Fix yaml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c82088e71f..26fb69db71e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -578,8 +578,7 @@ jobs: - uses: jiro4989/setup-nim-action@v1 - name: install library working-directory: nim - run: nimble -y develop - run: nimble install + run: nimble -y develop && nimble install - name: test working-directory: tests/nim run: python3 testnim.py