Skip to content

Commit

Permalink
Merge tag '0.10.1-pre1' into sles15-sp7
Browse files Browse the repository at this point in the history
  • Loading branch information
mwilck committed Nov 21, 2024
2 parents f1419d2 + 84a4dcc commit ecfc7e6
Show file tree
Hide file tree
Showing 14 changed files with 211 additions and 42 deletions.
89 changes: 89 additions & 0 deletions .github/workflows/abi-stable.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: check-abi for stable branch
on:
push:
branches:
- 'stable-*'
paths:
- '.github/workflows/abi-stable.yaml'
- '**.h'
- '**.c'
- '**.version'
pull_request:
branches:
- 'stable-*'
workflow_dispatch:

jobs:
reference-abi:
runs-on: ubuntu-20.04
steps:
- name: get parent tag
run: >
echo ${{ github.ref }} |
sed -E 's,refs/heads/stable-([0-9]\.[0-9]*)\.y,PARENT_TAG=\1.0,' >> $GITHUB_ENV
- name: assert parent tag
run: /bin/false
if: ${{ env.PARENT_TAG == '' }}
- name: update
run: sudo apt-get update
- name: dependencies
run: >
sudo apt-get install --yes gcc
gcc make pkg-config abigail-tools
libdevmapper-dev libreadline-dev libaio-dev libsystemd-dev
libudev-dev libjson-c-dev liburcu-dev libcmocka-dev libedit-dev
- name: checkout ${{ env.PARENT_TAG }}
uses: actions/checkout@v4
with:
ref: ${{ env.PARENT_TAG }}
- name: build ABI for ${{ env.PARENT_TAG }}
run: make -j$(grep -c ^processor /proc/cpuinfo) -Orecurse abi
- name: save ABI
uses: actions/upload-artifact@v4
with:
name: multipath-abi-${{ env.PARENT_TAG }}
path: abi

check-abi:
runs-on: ubuntu-20.04
needs: reference-abi
steps:
- name: get parent tag
run: >
echo ${{ github.ref }} |
sed -E 's,refs/heads/stable-([0-9]\.[0-9]*)\.y,PARENT_TAG=\1.0,' >> $GITHUB_ENV
- name: assert parent tag
run: /bin/false
if: ${{ env.PARENT_TAG == '' }}
- name: checkout ${{ env.PARENT_TAG }}
uses: actions/checkout@v4
with:
ref: ${{ env.PARENT_TAG }}
- name: download ABI for ${{ env.PARENT_TAG }}
id: download_abi
uses: actions/download-artifact@v4
with:
name: multipath-abi-${{ env.PARENT_TAG }}
path: reference-abi
- name: update
run: sudo apt-get update
if: steps.download_abi.outcome != 'success'
- name: dependencies
run: >
sudo apt-get install --yes gcc
gcc make pkg-config abigail-tools
libdevmapper-dev libreadline-dev libaio-dev libsystemd-dev
libudev-dev libjson-c-dev liburcu-dev libcmocka-dev libedit-dev
- name: check ABI of ${{ github.ref }} against ${{ env.PARENT_TAG }}
id: check_abi
run: make -j$(grep -c ^processor /proc/cpuinfo) -Orecurse abi-test
continue-on-error: true
- name: save differences
if: ${{ steps.check_abi.outcome != 'success' }}
uses: actions/upload-artifact@v4
with:
name: abi-test
path: abi-test
- name: fail
run: /bin/false
if: steps.check_abi.outcome != 'success'
8 changes: 5 additions & 3 deletions .github/workflows/abi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: get reference ABI
id: reference
continue-on-error: true
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v6
with:
workflow: abi.yaml
branch: ${{ env.ABI_BRANCH }}
Expand All @@ -45,21 +45,23 @@ jobs:
- name: create ABI
run: make -Orecurse -j$(grep -c ^processor /proc/cpuinfo) abi.tar.gz
- name: save ABI
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: abi
path: abi
overwrite: true
- name: compare ABI against reference
id: compare
continue-on-error: true
if: ${{ steps.reference.outcome == 'success' }}
run: make abi-test
- name: save differences
if: ${{ steps.compare.outcome == 'failure' }}
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: abi-test
path: abi-test
overwrite: true

- name: fail
# MUST use >- here, otherwise the condition always evaluates to true
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-and-unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ on:
- next
- factory
- sles*
- 'stable-*'
pull_request:
branches:
- master
- queue
- 'stable-*'
jobs:
jammy:
runs-on: ubuntu-22.04
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/foreign.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- next
- factory
- sles*
- 'stable-*'
paths:
- '.github/workflows/foreign.yaml'
- '**.h'
Expand All @@ -18,6 +19,7 @@ on:
branches:
- master
- queue
- 'stable-*'
paths:
- '.github/workflows/foreign.yaml'
- '**.h'
Expand All @@ -39,14 +41,13 @@ jobs:
- name: checkout
uses: actions/checkout@v1
- name: build
run: make -j8 -Orecurse test-progs
- name: create binary archive
run: make test-progs.tar
run: make -j -Orecurse test-progs.tar
- name: upload binary archive
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: cross-${{ matrix.os }}-${{ matrix.arch }}
path: test-progs.tar
overwrite: true

test:
runs-on: ubuntu-22.04
Expand All @@ -64,11 +65,11 @@ jobs:
run: echo CONTAINER_ARCH="arm/v7" >> $GITHUB_ENV
if: ${{ matrix.arch == 'armhf' }}
- name: download binary archive
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: cross-${{ matrix.os }}-${{ matrix.arch }}
- name: unpack binary archive
run: tar xfv cross-${{ matrix.os }}-${{ matrix.arch }}/test-progs.tar
run: tar xfv test-progs.tar
- name: enable foreign arch
uses: dbhi/qus/action@main
- name: run tests
Expand Down Expand Up @@ -103,11 +104,11 @@ jobs:
run: echo CONTAINER_ARCH="arm/v7" >> $GITHUB_ENV
if: ${{ matrix.arch == 'armhf' }}
- name: download binary archive
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: cross-${{ matrix.os }}-${{ matrix.arch }}
- name: unpack binary archive
run: tar xfv cross-${{ matrix.os }}-${{ matrix.arch }}/test-progs.tar
run: tar xfv test-progs.tar
- name: enable foreign arch
uses: dbhi/qus/action@main
- name: run tests
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/multiarch-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
- master
- queue
- tip
- 'stable-*'
paths:
- '.github/workflows/multiarch-stable.yaml'
- '**.h'
Expand All @@ -15,6 +16,7 @@ on:
branches:
- master
- queue
- 'stable-*'
paths:
- '.github/workflows/multiarch-stable.yaml'
- '**.h'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/multiarch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- tip
- next
- edge
- 'stable-*'
paths:
- '.github/workflows/multiarch.yaml'
- '**.h'
Expand All @@ -17,6 +18,7 @@ on:
branches:
- master
- queue
- 'stable-*'
paths:
- '.github/workflows/multiarch.yaml'
- '**.h'
Expand Down
83 changes: 61 additions & 22 deletions .github/workflows/native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- next
- factory
- sles*
- 'stable-*'
paths:
- '.github/workflows/native.yaml'
- '**.h'
Expand All @@ -18,6 +19,7 @@ on:
branches:
- master
- queue
- 'stable-*'
paths:
- '.github/workflows/native.yaml'
- '**.h'
Expand All @@ -38,17 +40,9 @@ jobs:
- debian-bookworm
- fedora-40
- opensuse-leap
container: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
steps:
- name: checkout
uses: actions/checkout@v1
- name: build and test
if: ${{ matrix.os != 'debian-jessie' }}
run: make -j -Orecurse test
- name: build and test (jessie)
# On jessie, we use libreadline 5 (no licensing issue)
if: ${{ matrix.os == 'debian-jessie' }}
run: make -j -Orecurse READLINE=libreadline test

- name: set archive name
# Leap containers have cpio but not tar
Expand All @@ -57,26 +51,71 @@ jobs:
- name: set archive name
run: echo ARCHIVE_TGT=test-progs.tar >> $GITHUB_ENV
if: ${{ matrix.os != 'opensuse-leap' }}
- name: create binary archive
run: make ${{ env.ARCHIVE_TGT }}

- name: build and test
if: ${{ matrix.os != 'debian-jessie' }}
uses: mosteo-actions/docker-run@v1
with:
image: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
command: -j -Orecurse test
- name: build and test (jessie)
# On jessie, we use libreadline 5 (no licensing issue)
if: ${{ matrix.os == 'debian-jessie' }}
uses: mosteo-actions/docker-run@v1
with:
image: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
command: -j -Orecurse READLINE=libreadline test

- name: create ${{ env.ARCHIVE_TGT }}
if: ${{ matrix.os != 'debian-jessie' }}
uses: mosteo-actions/docker-run@v1
with:
image: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
command: ${{ env.ARCHIVE_TGT }}
- name: create ${{ env.ARCHIVE_TGT }} (jessie)
if: ${{ matrix.os == 'debian-jessie' }}
uses: mosteo-actions/docker-run@v1
with:
image: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
command: READLINE=libreadline ${{ env.ARCHIVE_TGT }}

- name: upload binary archive
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: native-${{ matrix.os }}
path: ${{ env.ARCHIVE_TGT }}
overwrite: true

clang:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
os:
- debian-jessie
- debian-buster
- debian-bullseye
- debian-bookworm
- fedora-40
- opensuse-leap
steps:
- name: checkout
uses: actions/checkout@v1

- name: clean
run: make clean
- name: clang
if: ${{ matrix.os != 'debian-jessie' }}
env:
CC: clang
run: make -j -Orecurse test
uses: mosteo-actions/docker-run@v1
with:
image: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
params: -e CC=clang
command: -j -Orecurse test
- name: clang (jessie)
if: ${{ matrix.os == 'debian-jessie' }}
env:
CC: clang
run: make READLINE=libreadline test
uses: mosteo-actions/docker-run@v1
with:
image: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
params: -e CC=clang
command: -j -Orecurse READLINE=libreadline test

root-test:
runs-on: ubuntu-22.04
Expand All @@ -101,14 +140,14 @@ jobs:
uses: actions/checkout@v1

- name: download binary archive
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: native-${{ matrix.os }}
- name: unpack binary archive
run: cpio -idv < native-${{ matrix.os }}/test-progs.cpio
run: cpio -idv < test-progs.cpio
if: ${{ matrix.os == 'opensuse-leap' }}
- name: unpack binary archive
run: tar xfmv native-${{ matrix.os }}/test-progs.tar
run: tar xfmv test-progs.tar
if: ${{ matrix.os != 'opensuse-leap' }}

- name: run root tests
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rolling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- tip
- next
- edge
- 'stable-*'
paths:
- '.github/workflows/rolling.yaml'
- '**.h'
Expand All @@ -17,6 +18,7 @@ on:
branches:
- master
- queue
- 'stable-*'
paths:
- '.github/workflows/rolling.yaml'
- '**.h'
Expand Down
Loading

0 comments on commit ecfc7e6

Please sign in to comment.