proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-16 12:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Fix Fedora CI

Browse Source
This commit is contained in:
Richard Hughes 2022-04-22 10:26:23 +01:00
parent e9f765dc47
commit 95022acffb
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -45,7 +45,7 @@ jobs:
mingw64-libarchive mingw64-libarchive
mingw64-json-glib mingw64-json-glib
mingw64-curl mingw64-curl
wine && dnf install -y https://kojipkgs.fedoraproject.org/packages/glib2/2.72.0/2.fc36/i686/glib2-2.72.0-2.fc36.i686.rpm https://kojipkgs.fedoraproject.org/packages/glib2/2.72.0/2.fc36/x86_64/glib2-2.72.0-2.fc36.x86_64.rpm https://kojipkgs.fedoraproject.org/packages/glib2/2.72.0/2.fc36/x86_64/glib2-devel-2.72.0-2.fc36.x86_64.rpm wine
- checkout - checkout
- run: - run:
name: "Build Win32" name: "Build Win32"

2
contrib/ci/Dockerfile-fedora.in
View File

@ -1,4 +1,4 @@
FROM fedora:35 FROM fedora:36
%%%OS%%% %%%OS%%%
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en

3
contrib/ci/fedora.sh
View File

@ -6,7 +6,6 @@ set -x
./contrib/ci/fwupd_setup_helpers.py install-dependencies --yes -o fedora ./contrib/ci/fwupd_setup_helpers.py install-dependencies --yes -o fedora
#generate a tarball #generate a tarball
git config tar.tar.xz.command "xz -c"
mkdir -p build && pushd build mkdir -p build && pushd build
rm -rf * rm -rf *
@ -14,8 +13,6 @@ if [ "$QUBES" = "true" ]; then
QUBES_MACRO=(--define "qubes_packages 1") QUBES_MACRO=(--define "qubes_packages 1")
fi fi
dnf install -y python3-pip
python3 -m pip install --user "meson >= 0.60.0"
meson .. \ meson .. \
-Ddocs=none \ -Ddocs=none \
-Dman=true \ -Dman=true \