www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity

CI: Update used actions to use newer Node.js than 20

Browse Source 
CI: Update upload-artifact action, drop unnecessary Ubuntu 22.04 fix
CI: Drop 'shell: cmd', use PowerShell for the Windows workflow
CI: Print used CMake version for Windows workflow

Submitted by: Vladimír Chlup <vchlup ibm.com>
Github: closes #660


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934917 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2026-06-03 10:40:17 +00:00
parent 0237005ebe
commit ca0ff167c8
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/linux.yml vendored
View File

@@ -344,9 +344,6 @@ jobs:
echo "${{ matrix.env }}" >> $GITHUB_ENV
echo JOBID=`echo "OS=$ImageOS ${{ matrix.notest-cflags }} ${{ matrix.env }} ${{ matrix.config }}" \
| md5sum - | sed 's/ .*//'` >> $GITHUB_ENV
# https://github.com/actions/runner-images/issues/9491#issuecomment-1989718917
- name: Workaround ASAN issue in Ubuntu 22.04
run: sudo sysctl vm.mmap_rnd_bits=28
- name: apt refresh
run: sudo apt-get -o Acquire::Retries=5 update
- name: Install prerequisites
@@ -375,7 +372,7 @@ jobs:
- name: Configure environment
run: ./test/travis_before_linux.sh
timeout-minutes: 15
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: failure()
with:
name: config.log-${{ env.JOBID }}
@@ -383,7 +380,7 @@ jobs:
/home/runner/build/**/config.log
- name: Build and test
run: ./test/travis_run_linux.sh
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: failure()
with:
name: error_log-${{ env.JOBID }}

13
.github/workflows/windows.yml vendored
View File

@@ -45,7 +45,7 @@ jobs:
ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
@@ -57,15 +57,14 @@ jobs:
- uses: actions/checkout@v6
- name: Configure CMake
shell: cmd
run: |
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^
-G "${{ matrix.generator }}" ^
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^
-DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include ^
cmake --version
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} `
-G "${{ matrix.generator }}" `
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
-DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include `
"-DAPR_LIBRARIES=C:/vcpkg/installed/${{ matrix.triplet }}/lib/libapr-1.lib;C:/vcpkg/installed/${{ matrix.triplet }}/lib/libaprutil-1.lib"
- name: Build
shell: cmd
run: |
cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}