diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index b33dd52..fd80331 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -1,5 +1,6 @@ name: Push Multiarch Images on: + workflow_dispatch: pull_request: push: branches: @@ -36,6 +37,7 @@ jobs: name: Combine Rocks and Push Multiarch Manifest uses: canonical/k8s-workflows/.github/workflows/assemble_multiarch_image.yaml@main needs: [build-and-push-arch-specifics] + if: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas != '[]' }} with: - rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.rock-metas }} + rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas }} dry-run: ${{ github.event_name != 'push' }} diff --git a/2.1.6/rockcraft.yaml b/2.1.6/rockcraft.yaml index 975c595..7488f64 100644 --- a/2.1.6/rockcraft.yaml +++ b/2.1.6/rockcraft.yaml @@ -114,3 +114,21 @@ parts: dpkg -x ./libssl1.1_1.1.0g-2ubuntu4_amd64.deb ${CRAFT_PART_INSTALL}/ wget http://security.ubuntu.com/ubuntu/pool/main/o/openldap/libldap-2.4-2_2.4.49+dfsg-2ubuntu1.10_amd64.deb dpkg -x ./libldap-2.4-2_2.4.49+dfsg-2ubuntu1.10_amd64.deb ${CRAFT_PART_INSTALL}/ + ##test + ##test2 + ##test3 + ##test4 + ##test5 + ##test6 + ##test7 + ##test8 + ##test9 + ##test10 + ##test11 + ##test12 + ##test13 + ##test14 + ##test15 + ##test16 + ##test17 + ##test18 diff --git a/README.md b/README.md index 3e03471..3136275 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,5 @@ OCI image for [fluent-bit](https://github.com/fluent/fluent-bit) based on Ubuntu Image is loosely based on original [Dockerfile](https://github.com/fluent/fluent-bit/blob/master/dockerfiles/Dockerfile) and [Makefile](https://github.com/fluent/fluent-bit/tree/master/cmake) + +# test