Skip to content

Commit 142780c

Browse files
committed
Update edpm-bootc workflow
Use bash shell everywhere, including in the Makefile, since it would be used in the github workflow. Use podman to run the output/yum.repos.d target since running that natively on the github workflow ubuntu runner would not work (no dnf avaiable). Signed-off-by: James Slagle <[email protected]>
1 parent 2688a66 commit 142780c

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/edpm-bootc.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ on:
66
- '*'
77
paths:
88
- bootc/**
9+
- .github/workflows/edpm-bootc.yaml
910
workflow_dispatch:
1011

1112
env:
1213
imageregistry: 'quay.io'
1314
imagenamespace: ${{ secrets.IMAGENAMESPACE || secrets.QUAY_USERNAME }}
1415
latesttag: latest
1516

17+
defaults:
18+
run:
19+
shell: bash
20+
working-directory: ./bootc
21+
1622
jobs:
1723

1824
check-secrets:
@@ -40,16 +46,14 @@ jobs:
4046

4147
- name: Set latest tag for non main branch
4248
if: "${{ steps.branch-name.outputs.current_branch != 'main' }}"
43-
shell: bash
4449
run: |
4550
echo "latesttag=${{ steps.branch-name.outputs.current_branch }}-latest" >> $GITHUB_ENV
4651
4752
- name: Build edpm-bootc
4853
id: build-edpm-bootc
49-
shell: bash
5054
run: |
51-
cd bootc
5255
export EDPM_BOOTC_TAG=${latesttag}
56+
podman run --rm -it -v .:/bootc:rw,z quay.io/centos/centos:stream9 /bin/bash -c "cd bootc; dnf -y install make; make output/yum.repos.d"
5357
make build
5458
5559
- name: Push edpm-bootc To ${{ env.imageregistry }}
@@ -63,7 +67,6 @@ jobs:
6367
password: ${{ secrets.QUAY_PASSWORD }}
6468

6569
- name: Print image url and digest
66-
shell: bash
6770
run: |
6871
echo "Image pushed to ${{ steps.push-edpm-bootc.outputs.registry-paths }}"
6972
echo "Image digest: ${{ steps.push-edpm-bootc.outputs.digest }}"

bootc/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
SHELL := /bin/bash
12
EDPM_BOOTC_REPO ?= quay.io/openstack-k8s-operators/edpm-bootc
23
EDPM_BOOTC_TAG ?= latest
34
EDPM_CONTAINERFILE ?= Containerfile.centos9

0 commit comments

Comments
 (0)