File tree Expand file tree Collapse file tree 5 files changed +18
-18
lines changed
Expand file tree Collapse file tree 5 files changed +18
-18
lines changed Original file line number Diff line number Diff line change 11.PHONY : installdeps srpm
22
33installdeps :
4- dnf -y install git jq wget rpmlint nodejs
5- dnf \
6- --repofrompath=ovirt-master-snapshot,https://download.copr.fedorainfracloud.org/results/ovirt/ovirt-master-snapshot/centos-stream-8-x86_64/ \
7- install -y \
8- ovirt-engine-nodejs-modules
4+ dnf -y install git jq wget nodejs
95
106# explicity mark the copr generated git repo directory (which is done prior to the mock
117# call to the make_srpm and will be the current pwd) as safe for git commands
Original file line number Diff line number Diff line change 99 fail-fast : false
1010 matrix :
1111 include :
12- - name : el8
13- container-image : quay.io/ovirt/buildcontainer:el8stream
1412 - name : el9
15- container-image : quay.io/ovirt/buildcontainer:el9stream
13+ container-image : el9stream
14+ - name : el10
15+ container-image : el10stream
1616
1717 name : ${{ matrix.name }}, run check.sh to verify content
1818 container :
19- image : ${{ matrix.container-image }}
19+ image : quay.io/ovirt/buildcontainer: ${{ matrix.container-image }}
2020
2121 env :
2222 # The check version script needs to know the PR base and head commits to be able to
2828 steps :
2929 - name : make sure check.sh required packages are installed
3030 run : |
31- dnf -y install git jq wget rpmlint
31+ dnf -y install git jq wget nodejs
32+ dnf -y install rpmlint || pip3 install rpmlint
3233
3334 - name : checkout sources (PR head, not the PR merge)
3435 uses : ovirt/checkout-action@main
3940 env :
4041 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
4142 run : |
43+ git config --global --add safe.directory "$GITHUB_WORKSPACE"
4244 ./automation/check.sh
Original file line number Diff line number Diff line change @@ -19,14 +19,14 @@ jobs:
1919 fail-fast : false
2020 matrix :
2121 include :
22- - name : el8
23- container-image : quay.io/ovirt/buildcontainer:el8stream
2422 - name : el9
25- container-image : quay.io/ovirt/buildcontainer:el9stream
23+ container-image : el9stream
24+ - name : el10
25+ container-image : el10stream
2626
2727 name : ${{ matrix.name }}, build the rpm repo
2828 container :
29- image : ${{ matrix.container-image }}
29+ image : quay.io/ovirt/buildcontainer: ${{ matrix.container-image }}
3030
3131 env :
3232 CHECK_VERSION : no
4040 env :
4141 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
4242 run : |
43+ git config --global --add safe.directory "$GITHUB_WORKSPACE"
4344 gh pr checkout --repo ${GITHUB_REPOSITORY} ${PR_NUMBER}
4445
4546 - name : install build.sh required packages and most current nodejs-modules (as a fetch cache)
Original file line number Diff line number Diff line change 11Name: ovirt-engine-nodejs-modules
22Version: 2.3.20
3- Release: 1 %{?dist }
3+ Release: 2 %{?dist }
44Summary: Node.js modules required to build oVirt JavaScript applications
55Group: Virtualization/Management
66License: Multiple
@@ -14,7 +14,6 @@ BuildArch: noarch
1414BuildRequires: git
1515BuildRequires: jq
1616BuildRequires: wget
17- BuildRequires: rpmlint
1817BuildRequires: rpm-build
1918BuildRequires: nodejs >= 14.15.0
2019
@@ -50,6 +49,10 @@ install -m 755 `find . -maxdepth 1 -name 'yarn-*.js' -exec basename {} \;` %{des
5049%{_datadir }/%{name }
5150
5251%changelog
52+ * Wed May 28 2025 Jasper Berton <jasper.berton@team.blue> - 2.3.20-2
53+ - removed rpmlint from build dependencies due to it only being used in CI.
54+ - removed stale preseeds.
55+
5356* Thu Dec 15 2022 Sharon Gratch <sgratch@redhat.com> - 2.3.20-1
5457 - add preseed for https://github.com/oVirt/ovirt-web-ui/pull/1648
5558
Original file line number Diff line number Diff line change @@ -15,7 +15,6 @@ export default {
1515 } ,
1616 folder : '/' ,
1717 pr : [
18- 87 ,
1918 ]
2019 } ,
2120
@@ -26,7 +25,6 @@ export default {
2625 } ,
2726 folder : '/' ,
2827 pr : [
29- 1648 ,
3028 ]
3129 } ,
3230
You can’t perform that action at this time.
0 commit comments