From ed15d52c18e7cc873e098afc8db099ac5c61fdaf Mon Sep 17 00:00:00 2001 From: Riccardo Fadda Date: Tue, 25 Jul 2023 15:07:28 +0200 Subject: [PATCH 1/3] IT-422 Updated workflows for multi-architecture --- .github/pr-title-checker-config.json | 14 +++ .github/workflows/post-merge.yml | 113 +++++++++++++++++++++--- .github/workflows/pr.yml | 123 ++++++++++++++++++++++----- .github/workflows/release.yml | 114 ++++++++++++++++++++++--- 4 files changed, 321 insertions(+), 43 deletions(-) create mode 100644 .github/pr-title-checker-config.json diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json new file mode 100644 index 0000000..bfcc715 --- /dev/null +++ b/.github/pr-title-checker-config.json @@ -0,0 +1,14 @@ +{ + "LABEL": { + "name": "title needs correct naming convention", + "color": "EEEEEE" + }, + "CHECKS": { + "regexp": "[A-Z]{2,5}-[0-9]{1,5}" + }, + "MESSAGES": { + "success": "All OK", + "failure": "Failing PR test", + "notice": "Check the naming convention rules to naming PRs" + } +} \ No newline at end of file diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index 91e9dcc..20779fd 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -1,35 +1,122 @@ name: Post merge workflow + on: push: branches: - develop - release/* + +env: + PPL_TEMPLATE_VERSION: "v2.0.0" + ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }} + PR_CHECKER_PATH: ".github/pr-title-checker-config.json" + + DOCKER_ORG: entando + DOCKER_MF_IMAGE_BASE_NAME: entando-ab-core-navigation + DOCKER_MS_IMAGE_BASE_NAME: app-builder-menu-bff + DOCKER_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64 + DOCKER_MF_IMAGE_CONTEXT: . + DOCKER_MS_IMAGE_CONTEXT: ./microservices/app-builder-menu-bff + DOCKER_MF_IMAGE_FILE: ./.entando/output/Dockerfile + DOCKER_MS_IMAGE_FILE: ./microservices/app-builder-menu-bff/Dockerfile + DOCKER_IMAGE_PUSH: true + jobs: - app-build: + + check-pr: runs-on: ubuntu-latest + steps: + - uses: thehanimo/pr-title-checker@v1.3.7 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + pass_on_octokit_error: false + configuration_path: ${{ env.PR_CHECKER_PATH }} + + publication: + runs-on: ubuntu-latest + container: image: entando/ent:v7.1.3 volumes: - /var/run/docker.sock:/var/run/docker.sock + steps: - name: Checkout Code uses: actions/checkout@v3 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - registry: registry.hub.docker.com - username: ${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }} - password: ${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }} - - name: Pack the application bundle - id: pack - env: - DOCKER_ORG: entando + + - name: Run build command run: | versionSuffix=SNAPSHOT bash ./.github/functions/utils.sh setBundleVersion -$versionSuffix bash ./.github/functions/utils.sh setComponentVersions -$versionSuffix ent --debug bundle pack --org $DOCKER_ORG --stdout --fail-fast - ent --debug bundle publish version=$(bash ./.github/functions/utils.sh getBundleImage) echo "VERSION=$version" >> $GITHUB_OUTPUT - working-directory: ./ \ No newline at end of file + + - name: Docker meta-mf + id: meta-mf + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MF_IMAGE_BASE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr,value={{base_ref}} + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,event=pr,value={{base_ref}} + + - name: Docker meta-ms + id: meta-ms + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MS_IMAGE_BASE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,event=pr,value={{branch}} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + platforms: ${{ env.DOCKER_KEYCLOAK_IMAGE_ARCHITECTURE }} + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }} + password: ${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }} + + - name: Build and push microfrontend + uses: docker/build-push-action@v4 + with: + context: ${{ env.DOCKER_MF_IMAGE_CONTEXT }} + file: ${{ env.DOCKER_MF_IMAGE_FILE }} + push: ${{ env.DOCKER_IMAGE_PUSH }} + tags: ${{ steps.meta-mf.outputs.tags }} + labels: ${{ steps.meta-mf.outputs.labels }} + platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} + + - name: Build and push microservice + uses: docker/build-push-action@v4 + with: + context: ${{ env.DOCKER_MS_IMAGE_CONTEXT }} + file: ${{ env.DOCKER_MS_IMAGE_FILE }} + push: ${{ env.DOCKER_IMAGE_PUSH }} + tags: ${{ steps.meta-ms.outputs.tags }} + labels: ${{ steps.meta-ms.outputs.labels }} + platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 109a105..8ccd2ff 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,46 +1,131 @@ name: PR workflow + on: pull_request: types: - opened - synchronize - reopened + +env: + PPL_TEMPLATE_VERSION: "v2.0.0" + ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }} + PR_CHECKER_PATH: ".github/pr-title-checker-config.json" + + DOCKER_ORG: entando + DOCKER_MF_IMAGE_BASE_NAME: entando-ab-core-navigation + DOCKER_MS_IMAGE_BASE_NAME: app-builder-menu-bff + DOCKER_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64 + DOCKER_MF_IMAGE_CONTEXT: . + DOCKER_MS_IMAGE_CONTEXT: ./microservices/app-builder-menu-bff + DOCKER_MF_IMAGE_FILE: ./.entando/output/Dockerfile + DOCKER_MS_IMAGE_FILE: ./microservices/app-builder-menu-bff/Dockerfile + DOCKER_IMAGE_PUSH: true + jobs: - app-build: + + check-pr: runs-on: ubuntu-latest + steps: + - uses: thehanimo/pr-title-checker@v1.3.7 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + pass_on_octokit_error: false + configuration_path: ${{ env.PR_CHECKER_PATH }} + + publication: + runs-on: ubuntu-latest + container: image: entando/ent:v7.1.3 volumes: - /var/run/docker.sock:/var/run/docker.sock + steps: + - name: Checkout Code uses: actions/checkout@v3 - - name: Check PR name - uses: Slashgear/action-check-pr-title@v4.3.0 - with: - regexp: "(^ENG-[0-9]{3,5} .*$|^ENGPM-[0-9]{3,5} .*$)" - helpMessage: "Example: 'ENG-123 A change' or 'ENGPM-123 A change'" - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - registry: registry.hub.docker.com - username: ${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }} - password: ${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }} - - name: Pack the application bundle - id: pack - env: - DOCKER_ORG: entando + + - name: Run build command + id: build run: | versionSuffix=$(echo "${{ github.event.pull_request.title }}" | awk '{print $1}') bash ./.github/functions/utils.sh setBundleVersion -$versionSuffix bash ./.github/functions/utils.sh setComponentVersions -$versionSuffix ent --debug bundle pack --org $DOCKER_ORG --stdout --fail-fast - ent --debug bundle publish version=$(bash ./.github/functions/utils.sh getBundleImage) echo "VERSION=$version" >> $GITHUB_OUTPUT - working-directory: ./ + - name: Publish artifact version uses: thollander/actions-comment-pull-request@v2 with: message: | - Requested publication of version: `${{ steps.pack.outputs.VERSION }}` + Requested publication of version: `${{ steps.build.outputs.VERSION }}` + + - name: Docker meta-mf + id: meta-mf + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MF_IMAGE_BASE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr,value={{base_ref}} + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,event=pr,value={{base_ref}} + + - name: Docker meta-ms + id: meta-ms + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MS_IMAGE_BASE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,event=pr,value={{branch}} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + platforms: ${{ env.DOCKER_KEYCLOAK_IMAGE_ARCHITECTURE }} + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }} + password: ${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }} + + - name: Build and push microfrontend + uses: docker/build-push-action@v4 + with: + context: ${{ env.DOCKER_MF_IMAGE_CONTEXT }} + file: ${{ env.DOCKER_MF_IMAGE_FILE }} + push: ${{ env.DOCKER_IMAGE_PUSH }} + tags: ${{ steps.meta-mf.outputs.tags }} + labels: ${{ steps.meta-mf.outputs.labels }} + platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} + + - name: Build and push microservice + uses: docker/build-push-action@v4 + with: + context: ${{ env.DOCKER_MS_IMAGE_CONTEXT }} + file: ${{ env.DOCKER_MS_IMAGE_FILE }} + push: ${{ env.DOCKER_IMAGE_PUSH }} + tags: ${{ steps.meta-ms.outputs.tags }} + labels: ${{ steps.meta-ms.outputs.labels }} + platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dcae7f0..9b767f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,37 +1,129 @@ name: Release + on: create: tags: - 'v*' + + +env: + PPL_TEMPLATE_VERSION: "v2.0.0" + ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }} + PR_CHECKER_PATH: ".github/pr-title-checker-config.json" + + DOCKER_ORG: entando + DOCKER_MF_IMAGE_BASE_NAME: entando-ab-core-navigation + DOCKER_MS_IMAGE_BASE_NAME: app-builder-menu-bff + DOCKER_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64 + DOCKER_MF_IMAGE_CONTEXT: . + DOCKER_MS_IMAGE_CONTEXT: ./microservices/app-builder-menu-bff + DOCKER_MF_IMAGE_FILE: ./.entando/output/Dockerfile + DOCKER_MS_IMAGE_FILE: ./microservices/app-builder-menu-bff/Dockerfile + DOCKER_IMAGE_PUSH: true + jobs: - app-build: + + check-pr: runs-on: ubuntu-latest + steps: + - uses: thehanimo/pr-title-checker@v1.3.7 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + pass_on_octokit_error: false + configuration_path: ${{ env.PR_CHECKER_PATH }} + + publication: + runs-on: ubuntu-latest + container: image: entando/ent:v7.1.3 volumes: - /var/run/docker.sock:/var/run/docker.sock + steps: + - name: Checkout Code uses: actions/checkout@v3 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - registry: registry.hub.docker.com - username: ${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }} - password: ${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }} + - name: Get release tag id: release run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - - name: Pack the application bundle + + - name: Run build command id: pack env: - DOCKER_ORG: entando RELEASE_VERSION: ${{ steps.release.outputs.tag }} run: | bash ./.github/functions/utils.sh setBundleVersionTag ${RELEASE_VERSION#v} bash ./.github/functions/utils.sh setComponentVersionsTag ${RELEASE_VERSION#v} ent --debug bundle pack --org $DOCKER_ORG --stdout --fail-fast - ent --debug bundle publish version=$(bash ./.github/functions/utils.sh getBundleImage) echo "VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT - working-directory: ./ \ No newline at end of file + + - name: Docker meta-mf + id: meta-mf + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MF_IMAGE_BASE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr,value={{base_ref}} + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,event=pr,value={{base_ref}} + + - name: Docker meta-ms + id: meta-ms + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MS_IMAGE_BASE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,event=pr,value={{branch}} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + platforms: ${{ env.DOCKER_KEYCLOAK_IMAGE_ARCHITECTURE }} + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }} + password: ${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }} + + - name: Build and push microfrontend + uses: docker/build-push-action@v4 + with: + context: ${{ env.DOCKER_MF_IMAGE_CONTEXT }} + file: ${{ env.DOCKER_MF_IMAGE_FILE }} + push: ${{ env.DOCKER_IMAGE_PUSH }} + tags: ${{ steps.meta-mf.outputs.tags }} + labels: ${{ steps.meta-mf.outputs.labels }} + platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} + + - name: Build and push microservice + uses: docker/build-push-action@v4 + with: + context: ${{ env.DOCKER_MS_IMAGE_CONTEXT }} + file: ${{ env.DOCKER_MS_IMAGE_FILE }} + push: ${{ env.DOCKER_IMAGE_PUSH }} + tags: ${{ steps.meta-ms.outputs.tags }} + labels: ${{ steps.meta-ms.outputs.labels }} + platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} \ No newline at end of file From bcd631063dce2a23a99990e9a49cd17cf98a6c95 Mon Sep 17 00:00:00 2001 From: Riccardo Fadda Date: Thu, 27 Jul 2023 12:08:34 +0200 Subject: [PATCH 2/3] IT-422 Added version tag to workflow --- .github/workflows/post-merge.yml | 9 +++++++-- .github/workflows/pr.yml | 8 ++++++-- .github/workflows/release.yml | 10 +++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index 20779fd..4b4d7f8 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -45,6 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Run build command + id: build run: | versionSuffix=SNAPSHOT bash ./.github/functions/utils.sh setBundleVersion -$versionSuffix @@ -107,7 +108,9 @@ jobs: context: ${{ env.DOCKER_MF_IMAGE_CONTEXT }} file: ${{ env.DOCKER_MF_IMAGE_FILE }} push: ${{ env.DOCKER_IMAGE_PUSH }} - tags: ${{ steps.meta-mf.outputs.tags }} + tags: | + ${{ steps.meta-mf.outputs.tags }} + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MF_IMAGE_BASE_NAME}}:${{ steps.build.outputs.VERSION }} labels: ${{ steps.meta-mf.outputs.labels }} platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} @@ -117,6 +120,8 @@ jobs: context: ${{ env.DOCKER_MS_IMAGE_CONTEXT }} file: ${{ env.DOCKER_MS_IMAGE_FILE }} push: ${{ env.DOCKER_IMAGE_PUSH }} - tags: ${{ steps.meta-ms.outputs.tags }} + tags: | + ${{ steps.meta-ms.outputs.tags }} + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MS_IMAGE_BASE_NAME}}:${{ steps.build.outputs.VERSION }} labels: ${{ steps.meta-ms.outputs.labels }} platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8ccd2ff..754e1db 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -116,7 +116,9 @@ jobs: context: ${{ env.DOCKER_MF_IMAGE_CONTEXT }} file: ${{ env.DOCKER_MF_IMAGE_FILE }} push: ${{ env.DOCKER_IMAGE_PUSH }} - tags: ${{ steps.meta-mf.outputs.tags }} + tags: | + ${{ steps.meta-mf.outputs.tags }} + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MF_IMAGE_BASE_NAME}}:${{ steps.build.outputs.VERSION }} labels: ${{ steps.meta-mf.outputs.labels }} platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} @@ -126,6 +128,8 @@ jobs: context: ${{ env.DOCKER_MS_IMAGE_CONTEXT }} file: ${{ env.DOCKER_MS_IMAGE_FILE }} push: ${{ env.DOCKER_IMAGE_PUSH }} - tags: ${{ steps.meta-ms.outputs.tags }} + tags: | + ${{ steps.meta-ms.outputs.tags }} + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MS_IMAGE_BASE_NAME}}:${{ steps.build.outputs.VERSION }} labels: ${{ steps.meta-ms.outputs.labels }} platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b767f6..5096739 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - name: Run build command - id: pack + id: build env: RELEASE_VERSION: ${{ steps.release.outputs.tag }} run: | @@ -114,7 +114,9 @@ jobs: context: ${{ env.DOCKER_MF_IMAGE_CONTEXT }} file: ${{ env.DOCKER_MF_IMAGE_FILE }} push: ${{ env.DOCKER_IMAGE_PUSH }} - tags: ${{ steps.meta-mf.outputs.tags }} + tags: | + ${{ steps.meta-mf.outputs.tags }} + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MF_IMAGE_BASE_NAME}}:${{ steps.build.outputs.VERSION }} labels: ${{ steps.meta-mf.outputs.labels }} platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} @@ -124,6 +126,8 @@ jobs: context: ${{ env.DOCKER_MS_IMAGE_CONTEXT }} file: ${{ env.DOCKER_MS_IMAGE_FILE }} push: ${{ env.DOCKER_IMAGE_PUSH }} - tags: ${{ steps.meta-ms.outputs.tags }} + tags: | + ${{ steps.meta-ms.outputs.tags }} + ${{ env.DOCKER_ORG }}/${{ env.DOCKER_MS_IMAGE_BASE_NAME}}:${{ steps.build.outputs.VERSION }} labels: ${{ steps.meta-ms.outputs.labels }} platforms: ${{ env.DOCKER_IMAGE_ARCHITECTURE }} \ No newline at end of file From d5c835dd6084af4fdcf98fdb3c6ee9f6968dedbe Mon Sep 17 00:00:00 2001 From: Riccardo Fadda Date: Thu, 27 Jul 2023 12:46:55 +0200 Subject: [PATCH 3/3] IT-422 Added function to get bundle version for tag --- .github/functions/utils.sh | 4 ++++ .github/workflows/post-merge.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/functions/utils.sh b/.github/functions/utils.sh index 07fab76..3ec4131 100755 --- a/.github/functions/utils.sh +++ b/.github/functions/utils.sh @@ -17,6 +17,10 @@ function getBundleImage() { ent bundle images | grep bundle | awk '{printf "%s:%s", $1, $2}' } +function getBundleVersion() { + ent bundle images | grep bundle | awk '{printf "%s", $2}' +} + function setComponentVersions() { local versionSuffix=$1 diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index 4b4d7f8..124c39f 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -51,7 +51,7 @@ jobs: bash ./.github/functions/utils.sh setBundleVersion -$versionSuffix bash ./.github/functions/utils.sh setComponentVersions -$versionSuffix ent --debug bundle pack --org $DOCKER_ORG --stdout --fail-fast - version=$(bash ./.github/functions/utils.sh getBundleImage) + version=$(bash ./.github/functions/utils.sh getBundleVersion) echo "VERSION=$version" >> $GITHUB_OUTPUT - name: Docker meta-mf diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 754e1db..dd8e5ea 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -53,7 +53,7 @@ jobs: bash ./.github/functions/utils.sh setBundleVersion -$versionSuffix bash ./.github/functions/utils.sh setComponentVersions -$versionSuffix ent --debug bundle pack --org $DOCKER_ORG --stdout --fail-fast - version=$(bash ./.github/functions/utils.sh getBundleImage) + version=$(bash ./.github/functions/utils.sh getBundleVersion) echo "VERSION=$version" >> $GITHUB_OUTPUT - name: Publish artifact version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5096739..ad5eb59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: bash ./.github/functions/utils.sh setBundleVersionTag ${RELEASE_VERSION#v} bash ./.github/functions/utils.sh setComponentVersionsTag ${RELEASE_VERSION#v} ent --debug bundle pack --org $DOCKER_ORG --stdout --fail-fast - version=$(bash ./.github/functions/utils.sh getBundleImage) + version=$(bash ./.github/functions/utils.sh getBundleVersion) echo "VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT - name: Docker meta-mf