diff --git a/.ci/build-kit/build_and_test.sh b/.ci/build-kit/build_and_test.sh index eabb58d..8ab8e93 100755 --- a/.ci/build-kit/build_and_test.sh +++ b/.ci/build-kit/build_and_test.sh @@ -9,8 +9,8 @@ cmake \ -DCB_V2G_BUILD_TESTS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -ninja -j$(nproc) -C build +ninja -C build trap "cp build/Testing/Temporary/LastTest.log /ext/ctest-report" EXIT -ninja -j$(nproc) -C build test +ninja -C build test diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 4306111..72fa7f1 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -1,34 +1,8 @@ name: Build and test libcbv2g -on: - pull_request: {} - workflow_dispatch: - inputs: - runner: - description: Which runner to use - type: choice - default: 'ubuntu-22.04' - required: true - options: - - 'ubuntu-22.04' - - 'large-ubuntu-22.04-xxl' jobs: - lint: - name: Lint - runs-on: ${{ inputs.runner || 'ubuntu-22.04' }} - steps: - - name: Checkout libcbv2g - uses: actions/checkout@v3 - with: - path: source - - name: Run clang-format - uses: everest/everest-ci/github-actions/run-clang-format@v1.1.0 - with: - source-dir: source - extensions: hpp,cpp - exclude: cache build_and_test: name: Build and test - runs-on: ${{ inputs.runner || 'ubuntu-22.04' }} + runs-on: ubuntu-22.04 steps: - name: Checkout libcbv2g uses: actions/checkout@v3 @@ -40,8 +14,8 @@ jobs: rsync -a source/.ci/build-kit/ scripts - name: Pull docker container run: | - docker pull --platform=linux/x86_64 --quiet ghcr.io/everest/build-kit-alpine:latest - docker image tag ghcr.io/everest/build-kit-alpine:latest build-kit + docker pull --quiet ghcr.io/everest/build-kit-alpine:v1.2.0 + docker image tag ghcr.io/everest/build-kit-alpine:v1.2.0 build-kit - name: Build and test run: | docker run \