From 7295790ddb25fd8f38465fc6276bd4813d20ba75 Mon Sep 17 00:00:00 2001 From: drodin Date: Wed, 24 Apr 2024 00:15:28 +0700 Subject: [PATCH] CI updates and fixes (#740) * CI update depricated packages and routines * CI fix MinGW build, closes #709 --- .github/workflows/ci-docs.yml | 4 ++-- .github/workflows/ci.yml | 23 +++++++++-------------- .github/workflows/ci/build.cmd | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 3ebe540528..7536cc003b 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e415c21ab5..0cca6873ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' @@ -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 }} @@ -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 @@ -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 }} @@ -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: @@ -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 }} @@ -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/request-action@v2.x @@ -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 diff --git a/.github/workflows/ci/build.cmd b/.github/workflows/ci/build.cmd index d1dd462170..6d7c6c1071 100644 --- a/.github/workflows/ci/build.cmd +++ b/.github/workflows/ci/build.cmd @@ -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