mirror of https://github.com/kiwix/libkiwix.git
Merge pull request #952 from kiwix/use-focal-ci
Few CI changes (mostly Linux Bionic to Focal)
This commit is contained in:
commit
58890a3f97
|
@ -8,7 +8,7 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
macOS:
|
macOS:
|
||||||
runs-on: macos-12
|
runs-on: macos-11
|
||||||
env:
|
env:
|
||||||
HOME: /Users/runner
|
HOME: /Users/runner
|
||||||
steps:
|
steps:
|
||||||
|
@ -54,19 +54,19 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- name: native_static
|
- name: native_static
|
||||||
target: native_static
|
target: native_static
|
||||||
image_variant: bionic
|
image_variant: focal
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- name: native_dyn
|
- name: native_dyn
|
||||||
target: native_dyn
|
target: native_dyn
|
||||||
image_variant: bionic
|
image_variant: focal
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- name: android_arm
|
- name: android_arm
|
||||||
target: android_arm
|
target: android_arm
|
||||||
image_variant: bionic
|
image_variant: focal
|
||||||
lib_postfix: '/arm-linux-androideabi'
|
lib_postfix: '/arm-linux-androideabi'
|
||||||
- name: android_arm64
|
- name: android_arm64
|
||||||
target: android_arm64
|
target: android_arm64
|
||||||
image_variant: bionic
|
image_variant: focal
|
||||||
lib_postfix: '/aarch64-linux-android'
|
lib_postfix: '/aarch64-linux-android'
|
||||||
- name: win32_static
|
- name: win32_static
|
||||||
target: win32_static
|
target: win32_static
|
||||||
|
@ -78,22 +78,12 @@ jobs:
|
||||||
lib_postfix: '64'
|
lib_postfix: '64'
|
||||||
env:
|
env:
|
||||||
HOME: /home/runner
|
HOME: /home/runner
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-20.04
|
||||||
container:
|
container:
|
||||||
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36"
|
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:37"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
shell: python
|
uses: actions/checkout@v3
|
||||||
run: |
|
|
||||||
from subprocess import check_call
|
|
||||||
from os import environ
|
|
||||||
command = [
|
|
||||||
'git', 'clone',
|
|
||||||
'https://github.com/${{github.repository}}',
|
|
||||||
'--depth=1',
|
|
||||||
'--branch', '${{ github.head_ref || github.ref_name }}'
|
|
||||||
]
|
|
||||||
check_call(command, cwd=environ['HOME'])
|
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
@ -116,7 +106,6 @@ jobs:
|
||||||
if [[ "${{matrix.target}}" =~ android_.* ]]; then
|
if [[ "${{matrix.target}}" =~ android_.* ]]; then
|
||||||
MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
|
MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
|
||||||
fi
|
fi
|
||||||
cd $HOME/libkiwix
|
|
||||||
meson . build ${MESON_OPTION}
|
meson . build ${MESON_OPTION}
|
||||||
cd build
|
cd build
|
||||||
ninja
|
ninja
|
||||||
|
@ -127,7 +116,7 @@ jobs:
|
||||||
if: startsWith(matrix.target, 'native_')
|
if: startsWith(matrix.target, 'native_')
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd $HOME/libkiwix/build
|
cd build
|
||||||
meson test --verbose
|
meson test --verbose
|
||||||
ninja coverage
|
ninja coverage
|
||||||
env:
|
env:
|
||||||
|
|
Loading…
Reference in New Issue