Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into quinteros
Browse files Browse the repository at this point in the history
  • Loading branch information
Fryguy committed Oct 26, 2023
2 parents b7f97be + e14d7b5 commit cb6ba12
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_appliances.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
env:
TARGET_PLATFORM: ${{ matrix.target }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build appliance images
env:
S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
env:
BUNDLE_PATH: scripts/vendor/bundle
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions kickstarts/partials/main/repos.ks.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ repo --name=appstream --baseurl=http://mirror.centos.org/centos/8-stream/AppStr
repo --name=extras --baseurl=http://mirror.centos.org/centos/8-stream/extras/x86_64/os/
repo --name=epel --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64 --excludepkgs=*qpid-proton*

repo --name=manageiq-17-quinteros --baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/$basearch
repo --name=manageiq-17-quinteros-noarch --baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/noarch
repo --name=manageiq-18-radjabov --baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/$basearch
repo --name=manageiq-18-radjabov-noarch --baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/noarch
<% if @build_type != "release" %>
repo --name=manageiq-17-quinteros-nightly --baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/$basearch
repo --name=manageiq-18-radjabov-nightly --baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/$basearch
<% end %>

<% if @target == "gce" %>
Expand Down

0 comments on commit cb6ba12

Please sign in to comment.