Skip to content

Commit

Permalink
Add CI support for no-galera installation of workers
Browse files Browse the repository at this point in the history
To solve chicken/egg problem of providing galera
workers to build the galera-4 package.
  • Loading branch information
grooverdan committed Aug 14, 2024
1 parent 7a24126 commit ce46e09
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/bbw_build_container_rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ jobs:
run: |
cd ${{ env.WORKDIR }}
cat ${{ matrix.dockerfile }} qpress.Dockerfile buildbot-worker.Dockerfile >$GITHUB_WORKSPACE/Dockerfile
if [ "${{ matrix.nogalera }}" == true ]; then
sed -i -e '/ci.mariadb.org\/galera/d' -e '/WSREP_PROVIDER/d' -e '/galera-4/d' $GITHUB_WORKSPACE/Dockerfile
fi
cp -r qpress $GITHUB_WORKSPACE
- name: Check Dockerfile with hadolint
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/bbw_build_container_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ jobs:
cd ${{ env.WORKDIR }}
cat ${{ inputs.dockerfile }} qpress.Dockerfile buildbot-worker.Dockerfile >$GITHUB_WORKSPACE/Dockerfile
cp -r qpress $GITHUB_WORKSPACE
if [ "${{ inputs.nogalera }}" == true ]; then
sed -i -e '/ci.mariadb.org\/galera/d' -e '/galera-4/d' -e '/WSREP_PROVIDER/d' $GITHUB_WORKSPACE/Dockerfile
fi
- name: Copy files on runner
if: ${{ inputs.files }}
Expand All @@ -78,8 +81,7 @@ jobs:
done
- name: No wsrep on 32 bit platforms
if: >
(contains(inputs.platforms, 'linux/386'))
if: contains(inputs.platforms, 'linux/386')
run: |
sed -i -e '/WSREP_PROVIDER/d' $GITHUB_WORKSPACE/Dockerfile
- name: Check Dockerfile with hadolint
Expand Down

0 comments on commit ce46e09

Please sign in to comment.