diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/actions/check-arch/action.yml | 4 | ||||
| -rw-r--r-- | .github/actions/check-symbols/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/basic.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/boost_toolsets.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/example_toolsets.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/msvc_versions.yml | 4 |
6 files changed, 13 insertions, 15 deletions
diff --git a/.github/actions/check-arch/action.yml b/.github/actions/check-arch/action.yml index b85be4e..b8e4d64 100644 --- a/.github/actions/check-arch/action.yml +++ b/.github/actions/check-arch/action.yml @@ -12,9 +12,9 @@ runs: steps: - run: | $script_path = if ($env:CI_TARGET_PE) { - Join-Path $env:GITHUB_WORKSPACE '.ci' 'verify_arch.ps1' + Join-Path $env:GITHUB_WORKSPACE 'test' 'scripts' 'verify_arch.ps1' } else { - Join-Path $env:GITHUB_WORKSPACE '.ci' 'verify_arch.sh' + Join-Path $env:GITHUB_WORKSPACE 'test' 'scripts' 'verify_arch.sh' } $exe_path = (Join-Path '${{ inputs.path }}' 'bin' 'foo') + $env:CI_EXE_EXT diff --git a/.github/actions/check-symbols/action.yml b/.github/actions/check-symbols/action.yml index 7428be3..3681f52 100644 --- a/.github/actions/check-symbols/action.yml +++ b/.github/actions/check-symbols/action.yml @@ -16,7 +16,7 @@ runs: $lib_dir = Join-Path $install_dir 'lib' $script_path = if ($env:CI_TARGET_ELF) { - Join-Path $env:GITHUB_WORKSPACE '.ci' 'verify_symbols.sh' + Join-Path $env:GITHUB_WORKSPACE 'test' 'scripts' 'verify_symbols.sh' } else { throw "Verifying symbols for PE executables is not implemented" } diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 5b1f63e..fa2bc0a 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -51,10 +51,9 @@ jobs: python -m project.boost.build boost/ filesystem - name: Build example project run: | - $src_dir = Join-Path examples boost - python -m project.build --boost boost/ --install install/ -- $src_dir build/ + python -m project.build --boost boost/ --install install/ -- test/examples/boost/ build/ - name: Run example project - run: ./.ci/run_foo.ps1 (Join-Path (Get-Location).Path install bin foo) + run: ./test/examples/boost/run.ps1 ./install/bin/foo # Check that the most basic use-case works w/ different Python versions. python-versions: @@ -96,10 +95,9 @@ jobs: boost-build boost/ filesystem - name: Build example project run: | - $src_dir = Join-Path examples boost - project-build --boost boost/ --install install/ -- $src_dir build/ + project-build --boost boost/ --install install/ -- test/examples/boost/ build/ - name: Run example project - run: ./.ci/run_foo.ps1 (Join-Path (Get-Location).Path install bin foo) + run: ./test/examples/boost/run.ps1 ./install/bin/foo # Build a Python package and upload to PyPI. publish: diff --git a/.github/workflows/boost_toolsets.yml b/.github/workflows/boost_toolsets.yml index 8f90191..ea7d287 100644 --- a/.github/workflows/boost_toolsets.yml +++ b/.github/workflows/boost_toolsets.yml @@ -3,7 +3,7 @@ name: Boost (toolsets) on: push: paths: - - 'examples/**' + - 'test/**' - 'project/**' schedule: # Weekly, at 5:30 AM on Saturday (somewhat randomly chosen). @@ -149,7 +149,7 @@ jobs: id: build_example uses: ./.github/actions/build-example with: - src-dir: examples/boost + src-dir: test/examples/boost boost-dir: '${{ env.BOOST_DIR }}' toolset: '${{ matrix.toolset }}' platform: '${{ matrix.platform }}' diff --git a/.github/workflows/example_toolsets.yml b/.github/workflows/example_toolsets.yml index 94ca380..42e1ec3 100644 --- a/.github/workflows/example_toolsets.yml +++ b/.github/workflows/example_toolsets.yml @@ -3,7 +3,7 @@ name: Examples (toolsets) on: push: paths: - - 'examples/**' + - 'test/**' - 'project/**' schedule: # Weekly, at 5:30 AM on Saturday (somewhat randomly chosen). @@ -122,7 +122,7 @@ jobs: id: build uses: ./.github/actions/build-example with: - src-dir: 'examples/${{ matrix.example }}' + src-dir: 'test/examples/${{ matrix.example }}' toolset: '${{ matrix.toolset }}' platform: '${{ matrix.platform }}' configuration: '${{ matrix.configuration }}' diff --git a/.github/workflows/msvc_versions.yml b/.github/workflows/msvc_versions.yml index 22f0d76..fd3c747 100644 --- a/.github/workflows/msvc_versions.yml +++ b/.github/workflows/msvc_versions.yml @@ -3,7 +3,7 @@ name: Visual Studio versions on: push: paths: - - 'examples/**' + - 'test/**' - 'project/**' schedule: # Weekly, at 5:30 AM on Saturday (somewhat randomly chosen). @@ -98,7 +98,7 @@ jobs: id: build_example uses: ./.github/actions/build-example with: - src-dir: examples/boost + src-dir: test/examples/boost boost-dir: '${{ env.BOOST_DIR }}' toolset: '${{ matrix.toolset }}' platform: '${{ matrix.platform }}' |
