diff --git a/.bazelrc b/.bazelrc index 247b2162..dcca3cac 100644 --- a/.bazelrc +++ b/.bazelrc @@ -33,37 +33,37 @@ build --credential_helper="*.qnx.com=%workspace%/tools/qnx_credential_helper.py" # ------------------------------------------------------------------------------- # Shared configuration for simple test execution # ------------------------------------------------------------------------------- -build:time_shared --incompatible_strict_action_env -build:time_shared --sandbox_writable_path=/var/tmp -build:time_shared --host_platform=@score_bazel_platforms//:x86_64-linux +build:shared --incompatible_strict_action_env +build:shared --sandbox_writable_path=/var/tmp +build:shared --host_platform=@score_bazel_platforms//:x86_64-linux # ------------------------------------------------------------------------------- # Config dedicated to host platform CPU:x86_64 and OS:Linux # ------------------------------------------------------------------------------- -build:time-x86_64-linux --config=time_shared -build:time-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix -build:time-x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0 +build:x86_64-linux --config=shared +build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix +build:x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0 # ------------------------------------------------------------------------------- # Config dedicated to host platform CPU:arm64 and OS:Linux # ------------------------------------------------------------------------------- -build:time-arm64-linux --config=time_shared -build:time-arm64-linux --platforms=@score_bazel_platforms//:aarch64-linux-gcc_12.2.0-posix -build:time-arm64-linux --extra_toolchains=@score_gcc_aarch64_toolchain//:aarch64-linux-gcc_12.2.0 +build:arm64-linux --config=shared +build:arm64-linux --platforms=@score_bazel_platforms//:aarch64-linux-gcc_12.2.0-posix +build:arm64-linux --extra_toolchains=@score_gcc_aarch64_toolchain//:aarch64-linux-gcc_12.2.0 # ------------------------------------------------------------------------------- # Config dedicated to target platform CPU:x86_64 and OS:QNX # ------------------------------------------------------------------------------- -build:time-x86_64-qnx --config=time_shared -build:time-x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix -build:time-x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0 +build:x86_64-qnx --config=shared +build:x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix +build:x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0 # ------------------------------------------------------------------------------- # Config dedicated to target platform CPU:arm64 and OS:QNX # ------------------------------------------------------------------------------- -build:time-arm64-qnx --config=time_shared -build:time-arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix -build:time-arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0 +build:arm64-qnx --config=shared +build:arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix +build:arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0 # ------------------------------------------------------------------------------- # Import local user workspace file, if exists diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 693e7b37..487aec30 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - config: [time-x86_64-linux, time-arm64-linux] + config: [x86_64-linux, arm64-linux] steps: - name: Checkout Repository uses: actions/checkout@v4.2.2 diff --git a/.github/workflows/build-qnx.yml b/.github/workflows/build-qnx.yml index 8e5407b2..a8119eb3 100644 --- a/.github/workflows/build-qnx.yml +++ b/.github/workflows/build-qnx.yml @@ -36,7 +36,7 @@ jobs: pull-requests: read strategy: matrix: - config: ['time-x86_64-qnx', 'time-arm64-qnx'] + config: ['x86_64-qnx', 'arm64-qnx'] with: bazel-target: '//score/... //examples/...' bazel-config: ${{ matrix.config }} diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 333ed94f..dc24706d 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -33,7 +33,7 @@ jobs: uses: eclipse-score/cicd-workflows/.github/workflows/cpp-coverage.yml@93aac16ada7d247bbb6ae926509ddea74cf5213a # v0.0.2 with: bazel-target: "//score/..." - bazel-config: "time-x86_64-linux" + bazel-config: "x86_64-linux" extra-bazel-flags: "--test_output=errors --nocache_test_results" artifact-name-suffix: "_cpp" retention-days: 10 diff --git a/.github/workflows/comp-tests.yml b/.github/workflows/comp-tests.yml index 94bf9476..36f5e072 100644 --- a/.github/workflows/comp-tests.yml +++ b/.github/workflows/comp-tests.yml @@ -36,6 +36,6 @@ jobs: contents: read pull-requests: read with: - bazel-target: 'test --config=time-x86_64-linux //score/...' + bazel-target: 'test --config=x86_64-linux //score/...' upload-name: 'bazel-testlogs' packages: 'fakechroot' diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 5e46d2a4..a3b0378c 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -53,7 +53,7 @@ jobs: # continue-on-error is required: bazel exits non-zero when tests fail. # Remove once https://github.com/eclipse-score/time/issues/112 is resolved. continue-on-error: true - run: bazel test --keep_going --config=${{ matrix.config }} --config=time-x86_64-linux //score/... --verbose_failures + run: bazel test --keep_going --config=${{ matrix.config }} --config=x86_64-linux //score/... --verbose_failures - name: Upload test logs if: always() diff --git a/README.md b/README.md index 6c73d61c..d5da5e62 100644 --- a/README.md +++ b/README.md @@ -160,33 +160,33 @@ Follow the [S-CORE Development Environment Guide](https://eclipse-score.github.i Build all components for **Linux x86_64** by running: ```bash -bazel build --config=time-x86_64-linux //score/... //examples/... +bazel build --config=x86_64-linux //score/... //examples/... ``` Run all tests: ```bash -bazel test --config=time-x86_64-linux //score/... //examples/... +bazel test --config=x86_64-linux //score/... //examples/... ``` #### Other Platforms **Linux AArch64**: ```bash -bazel build --config=time-arm64-linux //score/... //examples/... -bazel test --config=time-arm64-linux //score/... //examples/... +bazel build --config=arm64-linux //score/... //examples/... +bazel test --config=arm64-linux //score/... //examples/... ``` **QNX x86_64**: ```bash -bazel build --config=time-x86_64-qnx //score/... //examples/... -bazel test --config=time-x86_64-qnx //score/... //examples/... +bazel build --config=x86_64-qnx //score/... //examples/... +bazel test --config=x86_64-qnx //score/... //examples/... ``` **QNX AArch64**: ```bash -bazel build --config=time-aarch64-qnx //score/... //examples/... -bazel test --config=time-aarch64-qnx //score/... //examples/... +bazel build --config=aarch64-qnx //score/... //examples/... +bazel test --config=aarch64-qnx //score/... //examples/... ``` #### Testing with Sanitizers @@ -194,7 +194,7 @@ bazel test --config=time-aarch64-qnx //score/... //examples/... To test with AddressSanitizer, UBSan, and LeakSanitizer enabled: ```bash -bazel test --config=time-x86_64-linux --config=asan_ubsan_lsan --build_tests_only //score/... //examples/... +bazel test --config=x86_64-linux --config=asan_ubsan_lsan --build_tests_only //score/... //examples/... ``` --- diff --git a/docs/index.rst b/docs/index.rst index e35c841d..d7d50f3d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -118,7 +118,7 @@ Run address, undefined-behaviour and leak sanitizers (powered by ``score_cpp_pol .. code-block:: bash - bazel test --config=asan_ubsan_lsan --config=time-x86_64-linux //score/... + bazel test --config=asan_ubsan_lsan --config=x86_64-linux //score/... Individual sanitizer aliases are also available: ``--config=asan``, ``--config=ubsan``, ``--config=lsan``.