Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

github actions: Add an offline build for el9 #1563

Merged
merged 2 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
test_el8_offline:
name: EL8 - test, build and publish rpm repo for the PR (ovirt-engine-nodejs-modules build)
name: EL8 (ovirt-engine-nodejs-modules build) - test, build and publish rpm repo for the PR
env:
OFFLINE_BUILD: 1

Expand All @@ -35,7 +35,7 @@ jobs:
directory: exported-artifacts/

test_el8_online:
name: EL8 - test and build the PR, but skip the rpm builds (online build)
name: EL8 (online build) - test and build the PR, but skip the rpm builds

runs-on: ubuntu-latest
container:
Expand All @@ -60,3 +60,24 @@ jobs:
# need 1 rpm repo artifact per distro. The rpm repo is generated from the
# offline build.
#

test_el9_offline:
name: EL9 (ovirt-engine-nodejs-modules build) - test, build and publish rpm repo for the PR
env:
OFFLINE_BUILD: 1

runs-on: ubuntu-latest
container:
image: quay.io/ovirt/buildcontainer:el9stream

steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Run automation/build.sh (installs build dependencies as necessary)
run: ./automation/build.sh

- name: Upload artifacts as rpm repo
uses: ovirt/upload-rpms-action@v2
with:
directory: exported-artifacts/
2 changes: 1 addition & 1 deletion ovirt-web-ui.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BuildRequires: autoconf
BuildRequires: automake
%if %{offline_build}
# nodejs-modules embeds yarn and requires nodejs
BuildRequires: ovirt-engine-nodejs-modules >= 2.2.0
BuildRequires: ovirt-engine-nodejs-modules >= 2.3.2
%else
BuildRequires: nodejs >= 14.15
BuildRequires: yarn >= 1.22
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"@babel/preset-flow": "7.16.0",
"@babel/preset-react": "7.16.0",
"@formatjs/icu-messageformat-parser": "2.0.14",
"@pmmmwh/react-refresh-webpack-plugin":"0.5.5",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
"@redux-devtools/extension": "3.2.2",
"babel-jest": "27.3.1",
"babel-loader": "8.2.3",
"babel-loader": "8.2.5",
"camelcase": "6.2.1",
"case-sensitive-paths-webpack-plugin": "2.4.0",
"chalk": "4.1.2",
Expand Down Expand Up @@ -50,7 +50,7 @@
"react-refresh": "0.11.0",
"readline-sync": "1.4.10",
"table": "6.7.3",
"terser-webpack-plugin":"5.3.1",
"terser-webpack-plugin": "5.3.1",
"webpack": "5.72.0",
"webpack-cli": "4.9.1",
"webpack-dev-server": "4.8.1",
Expand Down
19 changes: 5 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2362,13 +2362,13 @@ babel-jest@27.3.1, babel-jest@^27.3.1:
graceful-fs "^4.2.4"
slash "^3.0.0"

babel-loader@8.2.3:
version "8.2.3"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
babel-loader@8.2.5:
version "8.2.5"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
dependencies:
find-cache-dir "^3.3.1"
loader-utils "^1.4.0"
loader-utils "^2.0.0"
make-dir "^3.1.0"
schema-utils "^2.6.5"

Expand Down Expand Up @@ -5534,15 +5534,6 @@ loader-utils@1.0.x:
emojis-list "^2.0.0"
json5 "^0.5.0"

loader-utils@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
dependencies:
big.js "^5.2.2"
emojis-list "^3.0.0"
json5 "^1.0.1"

loader-utils@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
Expand Down