From 8dd1afe76781a2471f1161f54286da9d3ac7874b Mon Sep 17 00:00:00 2001 From: aleksisch Date: Thu, 20 Feb 2025 15:02:16 +0300 Subject: [PATCH 1/3] Always build all targets in CI --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 745b9a1885..b81864b2c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,13 +157,11 @@ jobs: linux64) cmake --no-warn-unused-cli -B./build -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake_preset }} -G "${{ matrix.cmake_generator }}" cd build - ninja daslang - ninja daScriptTest + ninja ;; windows*) cmake --no-warn-unused-cli -B./build -G "${{ matrix.cmake_generator }}" -T host=x86 -A ${{ matrix.architecture_string }} - cmake --build ./build --config ${{ matrix.cmake_preset }} --target daslang - cmake --build ./build --config ${{ matrix.cmake_preset }} --target daScriptTest + cmake --build ./build --config ${{ matrix.cmake_preset }} ;; *) CC=clang CXX=clang++ cmake --no-warn-unused-cli -B./build -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake_preset }} -G "${{ matrix.cmake_generator }}" From 88a3528d0bf417dd87fc50fb8f06bdaed556b1f4 Mon Sep 17 00:00:00 2001 From: aleksisch Date: Thu, 20 Feb 2025 14:56:17 +0300 Subject: [PATCH 2/3] Add das source formatter to CI --- .github/workflows/build.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b81864b2c9..8f0743bb13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,6 +147,12 @@ jobs: ;; esac + - name: "Clone required repos" + uses: actions/checkout@master + with: + repository: aleksisch/das-fmt # Path to repository with das-fmt scripts + path: das-fmt + - name: "Build: Daslang" run: | set -eux @@ -172,6 +178,18 @@ jobs: ;; esac + - name: "Run formatter" + run: | + set -eux + case "${{ matrix.target }}${{ matrix.architecture }}" in + windows*) + ./bin/"${{ matrix.cmake_preset }}"/daslang ./das-fmt/dasfmt.das -- --path ./ --verify + ;; + *) + ./bin/daslang ./das-dmt/dasfmt.das -- --path ./ --verify + ;; + esac + - name: "Test" run: | set -eux From 3ef4106b94e20b5d01749579e07a255769c0af11 Mon Sep 17 00:00:00 2001 From: aleksisch Date: Thu, 20 Feb 2025 15:32:06 +0300 Subject: [PATCH 3/3] tmp --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f0743bb13..d77629a79a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -186,6 +186,9 @@ jobs: ./bin/"${{ matrix.cmake_preset }}"/daslang ./das-fmt/dasfmt.das -- --path ./ --verify ;; *) + ls -lh + ls -lh ./das-fmt + ls -lh ./das-fmt/das-fmt ./bin/daslang ./das-dmt/dasfmt.das -- --path ./ --verify ;; esac