Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2e92aaa
CI: update Linux toolchains to use Ubuntu 24.04 images
NeroBurner Apr 29, 2025
ff32e11
CI: ignore generated toolchains directory
NeroBurner May 2, 2025
081ce3a
CI: matrix: remove analyze and sanitize jobs
NeroBurner May 2, 2025
68699a5
set_matrix: use black formater on set_matrix.py file
NeroBurner Apr 29, 2025
a65cdd4
set_matrix: rewrite to create toolchains from name
NeroBurner Apr 29, 2025
4ca92f8
set_matrix: fix example dir on custom matrix.json
NeroBurner May 19, 2025
eadbeaa
CI: build.py: use python script instead of .sh and .cmd
NeroBurner May 5, 2025
2b1593d
ci: matrix: update for set_matrix.py rewrite
NeroBurner May 2, 2025
0564d44
ci: matrix_hunter_tests: remove python and scripts, update to ubuntu-…
NeroBurner May 5, 2025
ea8e132
CI: use build.py and new set_matrix.py output
NeroBurner May 2, 2025
f7982ce
ci: remove old jenkins.py file
NeroBurner May 5, 2025
70aedc9
CI: remove unused build.sh and build.cmd files
NeroBurner May 5, 2025
19c53fb
CI: remove obsolete build_hunter_tests.sh script
NeroBurner May 5, 2025
17de64b
docs: update creating-new with new set_matrix.py and build.py scripts
NeroBurner May 5, 2025
4b77102
filament: update CI build script and custom ci-matrix
NeroBurner May 19, 2025
8e0ff93
occt: update build script to not call build.sh
NeroBurner May 19, 2025
edb778c
pthreads: ci: update matrix to Windows 2022 image and VS17 compiler
NeroBurner May 19, 2025
795bb37
freetype-gl: ci: remove default-matrix copy, no call build.sh
NeroBurner May 19, 2025
93a5d9c
Boost: ci: update custom matrix with newest toolchains
NeroBurner May 19, 2025
3d01525
set_matrix: let script be relative to repo root (expected workdir)
NeroBurner May 20, 2025
b0908c2
freetype-gl: ci: shebang and executable bit
NeroBurner May 20, 2025
0b0aa24
filament: ci: shebang and executable bit for build.sh
NeroBurner May 20, 2025
fdd5007
occt: ci: shebang and executable bit for build.sh
NeroBurner May 20, 2025
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
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
toolchains/
41 changes: 28 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,27 @@ jobs:
if [ "${MATRIX}" ]; then
echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
else
echo "matrix=${MATRIX}"
exit 1
fi

- uses: actions/upload-artifact@v4
with:
name: toolchains
path: .github/toolchains

build:
name: ${{ matrix.example }} ${{ matrix.toolchain }} ${{ matrix.os }}
name: ${{ matrix.project }} ${{ matrix.toolchain }} ${{ matrix.os }}
needs: set_matrix
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.set_matrix.outputs.matrix) }}

env:
TOOLCHAIN: ${{ matrix.toolchain }}
PROJECT_DIR: examples/${{ matrix.example }}
TOOLCHAIN: '${{ matrix.toolchain }}'
PROJECT_DIR: ${{ matrix.example }}
SCRIPT: ${{ matrix.script }}
GITHUB_USER_PASSWORD: ${{ secrets.CPP_PM_BOT_TOKEN }}

steps:
Expand All @@ -74,6 +81,9 @@ jobs:
with:
submodules: true

- name: Download all workflow run artifacts
uses: actions/download-artifact@v4

- name: Set up Python
uses: actions/[email protected]
with:
Expand All @@ -87,26 +97,31 @@ jobs:
if: runner.os == 'Windows'
run: echo "HUNTER_PYTHON_LOCATION=$env:pythonLocation" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8

- name: Build hunter_tests Unix
if: runner.os != 'Windows' && matrix.toolchain == 'hunter_tests'
env:
PROJECT_DIR: ${{ matrix.example }}
run: |
bash ${{ matrix.script }}

- name: Build on Unix
if: runner.os != 'Windows' && matrix.toolchain != 'hunter_tests'
if: runner.os != 'Windows'
env:
BRANCH_NAME: ${{ github.ref_name }}
run: |
bash ${{ matrix.script }}
python .github/workflows/ci/build.py

- name: Build on Windows
if: runner.os == 'Windows' && matrix.toolchain != 'hunter_tests'
env:
BRANCH_NAME: ${{ github.ref_name }}
VCVARSALL: ${{ matrix.VCVARSALL }}
VCVARSALL_ARGS: ${{ matrix.VCVARSALL_ARGS }}
run: |
${{ matrix.script }}
if ("$env:VCVARSALL") {
Write-Host "call VCVARSALL using command '${env:VCVARSALL}' and args '${env:VCVARSALL_ARGS}'"
cmd /c 'call "%VCVARSALL%" %VCVARSALL_ARGS% && set' | foreach {
if ($_ -match "=") {
#"processing line: '$_'"
$v = $_.split("=");
set-item -force -path "ENV:\$($v[0])" -value "$($v[1])";
}
}
}
python .github/workflows/ci/build.py

set_status:
needs: [ set_matrix, build ]
Expand Down
46 changes: 0 additions & 46 deletions .github/workflows/ci/build.cmd

This file was deleted.

Loading
Loading