diff options
| -rw-r--r-- | .build.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/bump-homebrew.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 35 | ||||
| -rw-r--r-- | Dockerfile | 5 | ||||
| -rwxr-xr-x | build.sh | 9 | ||||
| -rwxr-xr-x | scripts/build.sh | 12 | ||||
| -rwxr-xr-x | scripts/test.sh | 18 | ||||
| -rwxr-xr-x | test.sh | 7 |
8 files changed, 45 insertions, 72 deletions
diff --git a/.build.yml b/.build.yml new file mode 100644 index 0000000..509588a --- /dev/null +++ b/.build.yml @@ -0,0 +1,14 @@ +image: archlinux +packages: + - docker +sources: + - https://git.sr.ht/~eugenetriguba/justify +tasks: + - setup-docker: | + sudo dockerd & + - build: | + cd justify + docker build --tag justify-build . + - test: | + cd justify + docker run --rm justify-build "./scripts/test.sh" diff --git a/.github/workflows/bump-homebrew.yml b/.github/workflows/bump-homebrew.yml deleted file mode 100644 index 8a9b2c9..0000000 --- a/.github/workflows/bump-homebrew.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Bump Homebrew - -on: - release: - types: [released] - -jobs: - homebrew: - name: Bump Homebrew formula - runs-on: ubuntu-22.04 - steps: - - uses: mislav/bump-homebrew-formula-action@v3 - with: - formula-name: justify - homebrew-tap: eugenetriguba/homebrew-justify - env: - COMMITTER_TOKEN: ${{ secrets.RELEASE_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index b2d5959..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Run tests - -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set build output directory - id: build-output-dir - shell: bash - run: | - echo "path=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - - name: Install dependencies - run: sudo apt-get install -y libcmocka-dev - - - name: Configure CMake - run: > - cmake -B ${{ steps.build-output-dir.outputs.path }} -S ${{ github.workspace }} - - - name: Build - run: cmake --build ${{ steps.build-output-dir.outputs.path }} - - - name: Test - working-directory: ${{ steps.build-output-dir.outputs.path }} - run: ctest --output-on-failure - - - name: Bats tests - run: ./tests/vendor/bats-core/bin/bats tests/ - @@ -19,9 +19,6 @@ RUN apk update && \ WORKDIR /app COPY . /app -RUN mkdir build \ - && cd build \ - && cmake .. \ - && cmake --build . +RUN ./scripts/build.sh ENTRYPOINT ["/bin/bash"] diff --git a/build.sh b/build.sh deleted file mode 100755 index edad40c..0000000 --- a/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -BUILD_DIR="build" -SRC_DIR="." - -cmake -B "$BUILD_DIR" -S "$SRC_DIR" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - -cmake --build "$BUILD_DIR" diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..9458002 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail + +BUILD_DIR="build" +SRC_DIR="." + +main() { + cmake -B "$BUILD_DIR" -S "$SRC_DIR" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + cmake --build "$BUILD_DIR" +} + +main "$@" diff --git a/scripts/test.sh b/scripts/test.sh new file mode 100755 index 0000000..ea35ef7 --- /dev/null +++ b/scripts/test.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail + +main() { + echo "Running tests..." + local ctest_result=0 + local bats_result=0 + + if ! (cd build && ctest --output-on-failure); then + ctest_result=1 + fi + if ! ./tests/vendor/bats-core/bin/bats ./tests/justify.bats; then + bats_result=1 + fi + exit $((ctest_result || bats_result)) +} + +main "$@" diff --git a/test.sh b/test.sh deleted file mode 100755 index b047904..0000000 --- a/test.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -source ./build.sh - -(cd build && ctest --output-on-failure) -./tests/vendor/bats-core/bin/bats ./tests/justify.bats |