Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI updates and fixes #740

Merged
merged 2 commits into from
Apr 23, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:

- name: Git checkout with submodules
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1
with:
submodules: true

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5.1.0
with:
python-version: 3.8

Expand Down
23 changes: 9 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:

- name: Git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1

- name: Manual dispatch, get project name from input
if: github.event_name == 'workflow_dispatch'
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Get changed files and save them to ${HOME}/files.json
if: github.event_name != 'workflow_dispatch'
id: files
uses: lots0logs/gh-action-get-changed-files@2.1.4
uses: lots0logs/gh-action-get-changed-files@2.2.2
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -49,7 +49,7 @@ jobs:
run: |
MATRIX=`python .github/workflows/set_matrix.py`
if [ "${MATRIX}" ]; then
echo "::set-output name=matrix::${MATRIX}"
echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
else
exit 1
fi
Expand All @@ -70,12 +70,12 @@ jobs:
steps:

- name: Git checkout with submodules
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1
with:
submodules: true

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5.1.0
with:
python-version: ${{ matrix.python }}

Expand All @@ -87,11 +87,6 @@ jobs:
if: runner.os == 'Windows'
run: echo "HUNTER_PYTHON_LOCATION=$env:pythonLocation" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8

- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]${GITHUB_REF#refs/heads/}"
id: extract_branch

- name: Build hunter_tests Unix
if: runner.os != 'Windows' && matrix.toolchain == 'hunter_tests'
env:
Expand All @@ -102,14 +97,14 @@ jobs:
- name: Build on Unix
if: runner.os != 'Windows' && matrix.toolchain != 'hunter_tests'
env:
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
BRANCH_NAME: ${{ github.ref_name }}
run: |
bash ${{ matrix.script }}

- name: Build on Windows
if: runner.os == 'Windows' && matrix.toolchain != 'hunter_tests'
env:
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
BRANCH_NAME: ${{ github.ref_name }}
run: |
${{ matrix.script }}

Expand All @@ -121,7 +116,7 @@ jobs:
steps:

- name: Git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1

- name: Get job status via GitHub API
uses: octokit/[email protected]
Expand All @@ -138,7 +133,7 @@ jobs:
python .github/workflows/set_status.py

- name: Deploy job status to GitHub Pages
uses: peaceiris/actions-gh-pages@v3.7.0-8
uses: peaceiris/actions-gh-pages@v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: job_data
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
:: Variable will be used in CMake so it's okay to use Unix style '/'
set HUNTER_GIT_EXECUTABLE=C:/Program Files/Git/bin/git.exe

set MINGW_PATH=C:\ProgramData\chocolatey\bin
set MINGW_PATH=C:\mingw64\bin

:: MSYS2 location
set MSYS_PATH=C:\msys64\usr\bin
Expand Down