Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:

jobs:
beman-submodule-check:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.0

preset-test:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.0
with:
matrix_config: >
[
Expand All @@ -27,7 +27,7 @@ jobs:
]

build-and-test:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.0
with:
matrix_config: >
{
Expand Down Expand Up @@ -119,12 +119,17 @@ jobs:
}

vcpkg-ci:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.0
with:
port_name: beman-iterator-interface
container_image: ghcr.io/bemanproject/infra-containers-gcc:14
feature_combinations: |
[
{"features": {}},
{"features": {"use-deducing-this": false}}
]

create-issue-when-fault:
needs: [preset-test, build-and-test]
if: failure() && github.event_name == 'schedule'
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.0
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ permissions:

jobs:
pre-commit:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.0
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
auto-update-pre-commit:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.0
secrets:
APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/vcpkg-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [published]
jobs:
vcpkg-release:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.6.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.0
with:
port_name: beman-iterator-interface
secrets:
Expand Down
7 changes: 7 additions & 0 deletions port/portfile.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ vcpkg_from_github(
HEAD_REF main
)

vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
use-deducing-this BEMAN_ITERATOR_INTERFACE_USE_DEDUCING_THIS
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBEMAN_ITERATOR_INTERFACE_BUILD_TESTS=OFF
-DBEMAN_ITERATOR_INTERFACE_BUILD_EXAMPLES=OFF
)
Expand Down
8 changes: 7 additions & 1 deletion port/vcpkg.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,11 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"default-features": ["use-deducing-this"],
"features": {
"use-deducing-this": {
"description": "Use deducing this for CRTP-free interface (BEMAN_ITERATOR_INTERFACE_USE_DEDUCING_THIS=ON)"
}
}
}