From d57675fc67455faf7c68d4003a1ce884779e2c7c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Apr 2023 10:17:38 +0200 Subject: Merging upstream version 2.4+really2.3. This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667. --- .github/workflows/build.yml | 314 ++++++-------------------------------------- 1 file changed, 41 insertions(+), 273 deletions(-) (limited to '.github/workflows/build.yml') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fae50a5..805a962 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,178 +3,29 @@ name: build on: push: - branches: [master] + branches: [ master ] pull_request: - branches: [master] + branches: [ master ] workflow_dispatch: jobs: - gcc-debug: - name: gcc debug + build-distro: runs-on: ubuntu-latest - steps: - - name: install dependencies - run: sudo apt-get install gcc pkg-config libjson-c-dev libhugetlbfs-dev - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - uses: bsfishy/meson-build@v1.0.3 - name: build - with: - action: build - setup-options: > - --werror - --buildtype=debug - -Dlibnvme:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test - with: - action: test - meson-version: 0.61.2 - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: log files - path: | - build/meson-logs/*.txt - - gcc-release: - name: gcc release - runs-on: ubuntu-latest - steps: - - name: install dependencies - run: sudo apt-get install gcc pkg-config libjson-c-dev libhugetlbfs-dev - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - uses: bsfishy/meson-build@v1.0.3 - name: build - with: - action: build - setup-options: > - --werror - --buildtype=release - -Dlibnvme:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test - with: - action: test - meson-version: 0.61.2 - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: log files - path: | - build/meson-logs/*.txt - - clang-release: - name: clang release - runs-on: ubuntu-latest - steps: - - name: install dependencies - run: sudo apt-get install clang pkg-config libjson-c-dev libhugetlbfs-dev - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - uses: bsfishy/meson-build@v1.0.3 - name: build - with: - action: build - setup-options: > - --werror - --buildtype=release - --cross-file=.github/cross/clang.txt - -Dlibnvme:werror=false - -Dopenssl:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test - with: - action: test - meson-version: 0.61.2 - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: log files - path: | - build/meson-logs/*.txt - - fallback-shared-libraries: - name: fallback shared libraries - runs-on: ubuntu-latest - steps: - - name: install dependencies - run: sudo apt-get install libpam-dev libcap-ng-dev - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - uses: BSFishy/meson-build@v1.0.3 - name: build - with: - action: build - setup-options: > - --werror - --buildtype=release - --wrap-mode=forcefallback - --default-library=shared - -Dlibnvme:werror=false - -Dopenssl:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test - with: - action: test - meson-version: 0.61.2 - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: log files - path: | - build/meson-logs/*.txt - fallback-static-libraries: - name: fallback static libraries - runs-on: ubuntu-latest steps: - name: install dependencies - run: sudo apt-get install libpam-dev libcap-ng-dev + run: sudo apt-get install libjson-c-dev libhugetlbfs-dev libdbus-1-dev - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: python-version: '3.x' - uses: BSFishy/meson-build@v1.0.3 - name: build - with: - action: build - setup-options: > - --werror - --buildtype=release - --wrap-mode=forcefallback - --default-library=static - -Dlibnvme:werror=false - -Dopenssl:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test with: + setup-options: --werror action: test - meson-version: 0.61.2 - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: log files - path: | - build/meson-logs/*.txt - cross-armhf: - name: cross armhf + build-cross-armhf: runs-on: ubuntu-latest steps: - name: set up arm architecture @@ -188,35 +39,23 @@ jobs: EOF sudo apt update - name: install armhf compiler - run: sudo apt install gcc-arm-linux-gnueabihf pkg-config qemu-user-static + run: sudo apt install gcc-arm-linux-gnueabihf pkg-config - name: install libraries - run: sudo apt install libjson-c-dev:armhf + run: sudo apt install uuid-dev:armhf libjson-c-dev:armhf libdbus-1-dev:armhf - uses: actions/checkout@v3 - uses: BSFishy/meson-build@v1.0.3 - name: build with: + # suppress python for now; the python headers currently assume native + setup-options: --werror --cross-file=.github/cross/ubuntu-armhf.txt -Dlibnvme:python=false + options: --verbose action: build - setup-options: > - --werror - --buildtype=release - --cross-file=.github/cross/ubuntu-armhf.txt - -Dlibnvme:python=disabled - -Dopenssl:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test - with: - action: test - meson-version: 0.61.2 - uses: actions/upload-artifact@v3 if: failure() with: - name: log files - path: | - build/meson-logs/*.txt + name: Linux_Meson_Testlog + path: build/meson-logs/testlog.txt - cross-ppc64le: - name: cross ppc64le + build-cross-ppc64le: runs-on: ubuntu-latest steps: - name: set up ppc64le architecture @@ -230,121 +69,50 @@ jobs: EOF sudo apt update - name: install powerpc64le compiler - run: sudo apt install gcc-powerpc64le-linux-gnu pkg-config qemu-user-static + run: sudo apt install gcc-powerpc64le-linux-gnu pkg-config - name: install libraries - run: sudo apt install libjson-c-dev:ppc64el + run: sudo apt install uuid-dev:ppc64el libjson-c-dev:ppc64el libdbus-1-dev:ppc64el - uses: actions/checkout@v3 - uses: BSFishy/meson-build@v1.0.3 - name: build with: + # suppress python for now; the python headers currently assume native + setup-options: --werror --cross-file=.github/cross/ubuntu-ppc64le.txt -Dlibnvme:python=false + options: --verbose action: build - setup-options: > - --werror - --buildtype=release - --cross-file=.github/cross/ubuntu-ppc64le.txt - -Dlibnvme:werror=false - -Dlibnvme:python=disabled - -Dopenssl:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test - with: - action: test - meson-version: 0.61.2 - uses: actions/upload-artifact@v3 if: failure() with: - name: log files - path: | - build/meson-logs/*.txt + name: Linux_Meson_Testlog + path: build/meson-logs/testlog.txt - cross-s390x: - name: cross s390x + build-fallback: runs-on: ubuntu-latest steps: - - name: set up s390x architecture - run: | - export release=$(lsb_release -c -s) - sudo dpkg --add-architecture s390x - sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list - sudo dd of=/etc/apt/sources.list.d/s390x.list < - --werror - --buildtype=release - --cross-file=.github/cross/ubuntu-s390x.txt - -Dlibnvme:werror=false - -Dlibnvme:python=disabled - -Dopenssl:werror=false - meson-version: 0.61.2 - - uses: bsfishy/meson-build@v1.0.3 - name: test + python-version: '3.x' + - uses: BSFishy/meson-build@v1.0.3 with: + setup-options: --werror -Dopenssl:werror=false -Ddbus:werror=false --wrap-mode=forcefallback + options: --verbose action: test meson-version: 0.61.2 - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: log files - path: | - build/meson-logs/*.txt - build-minimal: - name: muon minimal + build-static: runs-on: ubuntu-latest steps: + - name: install dependencies + run: sudo apt-get install -y libpam-dev libcap-ng-dev - uses: actions/checkout@v3 - - name: build muon and samurai build-tool - run: | - mkdir build-tools - cd build-tools - git clone --depth 1 https://git.sr.ht/~lattis/muon - cd muon - - export CC=gcc - export ninja=build/samu - - ./tools/bootstrap_ninja.sh build - ./bootstrap.sh build - - build/muon setup \ - -Dlibcurl=disabled \ - -Dlibarchive=disabled \ - -Ddocs=disabled \ - -Dsamurai=disabled \ - build - build/samu -C build - build/muon -C build test - - name: fetch libnvme - run: | - cd subprojects - git clone https://github.com/linux-nvme/libnvme.git - libnvme_ref=$(sed -n "s/revision = \([0-9a-z]\+\)/\1/p" libnvme.wrap) - git -C libnvme checkout $libnvme_ref - - name: build - run: | - export PATH=$(pwd)/build-tools/muon/build:$PATH - - muon setup \ - -Dlibnvme:python=disabled \ - -Dlibnvme:json-c=disabled \ - -Djson-c=disabled \ - build - samu -C build - - name: test - run: | - export PATH=$(pwd)/build-tools/muon/build:$PATH - - muon -C build test + - uses: actions/setup-python@v4 + with: + python-version: '3.x' + - uses: BSFishy/meson-build@v1.0.3 + with: + setup-options: --werror -Dopenssl:werror=false -Ddbus:werror=false --wrap-mode=forcefallback --default-library=static + options: --verbose + action: test + meson-version: 0.61.2 -- cgit v1.2.3